34 files changed, 765 insertions, 965 deletions
diff --git a/src/dht/dht.conf.in b/src/dht/dht.conf.in
index f828b725f..405ef1917 100644
--- a/src/dht/dht.conf.in
+++ b/src/dht/dht.conf.in
@@ -1,6 +1,6 @@
 [dht]
-FORCESTART = YES
+IMMEDIATE_START = YES
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2095
 HOSTNAME = localhost
 BINARY = gnunet-service-dht
diff --git a/src/dht/dht.h b/src/dht/dht.h
index 95ffa33ca..35d9e7cdb 100644
--- a/src/dht/dht.h
+++ b/src/dht/dht.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2001, 2002, 2003, 2004, 2009, 2011 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/dht/dht_api.c b/src/dht/dht_api.c
index af0dafbf3..ec5da3b0a 100644
--- a/src/dht/dht_api.c
+++ b/src/dht/dht_api.c
@@ -1,21 +1,19 @@
 /*
     This file is part of GNUnet.
-     Copyright (C) 2009, 2010, 2011, 2012, 2016 GNUnet e.V.
+     Copyright (C) 2009, 2010, 2011, 2012, 2016, 2018 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -86,7 +84,7 @@ struct GNUNET_DHT_GetHandle
  GNUNET_DHT_GetIterator iter;
  /**
-   * Closure for @a iter.
+   * Closure for @e iter.
   */
  void *iter_cls;
@@ -292,8 +290,8 @@ send_get (struct GNUNET_DHT_GetHandle *gh)
  get_msg->key = gh->key;
  get_msg->unique_id = gh->unique_id;
  GNUNET_memcpy (&get_msg[1],
-          &gh[1],
+                 &gh[1],
-          gh->xquery_size);
+                 gh->xquery_size);
  GNUNET_MQ_send (h->mq,
                  env);
 }
diff --git a/src/dht/dht_test_lib.c b/src/dht/dht_test_lib.c
index 52d5a3731..f9bd2c9e3 100644
--- a/src/dht/dht_test_lib.c
+++ b/src/dht/dht_test_lib.c
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2012 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
 * @file dht/dht_test_lib.c
diff --git a/src/dht/dht_test_lib.h b/src/dht/dht_test_lib.h
index 0b4a51c8f..2bdcf0158 100644
--- a/src/dht/dht_test_lib.h
+++ b/src/dht/dht_test_lib.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2012 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
 * @file dht/dht_test_lib.h
diff --git a/src/dht/gnunet-dht-get.c b/src/dht/gnunet-dht-get.c
index 842ec6270..3742ed739 100644
--- a/src/dht/gnunet-dht-get.c
+++ b/src/dht/gnunet-dht-get.c
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
 * @file dht/gnunet-dht-get.c
@@ -154,7 +152,9 @@ get_result_iterator (void *cls, struct GNUNET_TIME_Absolute exp,
                     const void *data)
 {
  FPRINTF (stdout,
-           _("Result %d, type %d:\n%.*s\n"),
+           (GNUNET_BLOCK_TYPE_TEST == type)
+           ? _("Result %d, type %d:\n%.*s\n")
+           : _("Result %d, type %d:\n"),
           result_count,
           type,
           (unsigned int) size,
@@ -196,8 +196,6 @@ run (void *cls, char *const *args, const char *cfgfile,
 {
  struct GNUNET_HashCode key;
  cfg = c;
  if (NULL == query_key)
  {
@@ -215,17 +213,22 @@ run (void *cls, char *const *args, const char *cfgfile,
    query_type = GNUNET_BLOCK_TYPE_TEST;
  GNUNET_CRYPTO_hash (query_key, strlen (query_key), &key);
  if (verbose)
-    FPRINTF (stderr, "%s `%s' \n",  _("Issueing DHT GET with key"), GNUNET_h2s_full (&key));
+    FPRINTF (stderr, "%s `%s' \n",
+             _("Issueing DHT GET with key"),
+             GNUNET_h2s_full (&key));
  GNUNET_SCHEDULER_add_shutdown (&cleanup_task, NULL);
  tt = GNUNET_SCHEDULER_add_delayed (timeout_request,
-                                     &timeout_task, NULL);
+                                     &timeout_task,
+                                     NULL);
  get_handle =
      GNUNET_DHT_get_start (dht_handle, query_type, &key, replication,
                            (demultixplex_everywhere) ? GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE : GNUNET_DHT_RO_NONE,
-                            NULL, 0, &get_result_iterator, NULL);
+                            NULL, 0,
+                            &get_result_iterator,
+                            NULL);
 }
 /**
 * Entry point for gnunet-dht-get
 *
@@ -236,15 +239,12 @@ run (void *cls, char *const *args, const char *cfgfile,
 int
 main (int argc, char *const *argv)
 {
  struct GNUNET_GETOPT_CommandLineOption options[] = {
    GNUNET_GETOPT_option_string ('k',
                                 "key",
                                 "KEY",
                                 gettext_noop ("the query key"),
                                 &query_key),
    GNUNET_GETOPT_option_uint ('r',
                               "replication",
                               "LEVEL",
diff --git a/src/dht/gnunet-dht-monitor.c b/src/dht/gnunet-dht-monitor.c
index b7360bbab..b08521c7b 100644
--- a/src/dht/gnunet-dht-monitor.c
+++ b/src/dht/gnunet-dht-monitor.c
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2012 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
 * @file dht/gnunet-dht-monitor.c
@@ -141,7 +139,8 @@ get_callback (void *cls,
              const struct GNUNET_PeerIdentity *path,
              const struct GNUNET_HashCode * key)
 {
-  FPRINTF (stdout, "GET #%u: type %d, key `%s'\n",
+  FPRINTF (stdout,
+           "GET #%u: type %d, key `%s'\n",
           result_count,
           (int) type,
           GNUNET_h2s_full(key));
@@ -176,8 +175,11 @@ get_resp_callback (void *cls,
                   size_t size)
 {
  FPRINTF (stdout,
-           "RESPONSE #%u: type %d, key `%s', data `%.*s'\n",
+           (GNUNET_BLOCK_TYPE_TEST == type)
+           ? "RESPONSE #%u (%s): type %d, key `%s', data `%.*s'\n"
+           : "RESPONSE #%u (%s): type %d, key `%s'\n",
           result_count,
+           GNUNET_STRINGS_absolute_time_to_string (exp),
           (int) type,
           GNUNET_h2s_full (key),
           (unsigned int) size,
@@ -215,8 +217,11 @@ put_callback (void *cls,
              size_t size)
 {
  FPRINTF (stdout,
-           "PUT %u: type %d, key `%s', data `%.*s'\n",
+           (GNUNET_BLOCK_TYPE_TEST == type)
+           ? "PUT %u (%s): type %d, key `%s', data `%.*s'\n"
+           : "PUT %u (%s): type %d, key `%s'\n",
           result_count,
+           GNUNET_STRINGS_absolute_time_to_string (exp),
           (int) type,
           GNUNET_h2s_full(key),
           (unsigned int) size,
@@ -234,7 +239,9 @@ put_callback (void *cls,
 * @param c configuration
 */
 static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
     const struct GNUNET_CONFIGURATION_Handle *c)
 {
  struct GNUNET_HashCode *key;
@@ -291,30 +298,30 @@ int
 main (int argc, char *const *argv)
 {
  struct GNUNET_GETOPT_CommandLineOption options[] = {
-  
    GNUNET_GETOPT_option_string ('k',
                                 "key",
                                 "KEY",
                                 gettext_noop ("the query key"),
                                 &query_key),
-  
    GNUNET_GETOPT_option_uint ('t',
                                   "type",
                                   "TYPE",
                                   gettext_noop ("the type of data to look for"),
                                   &block_type),
-  
    GNUNET_GETOPT_option_relative_time ('T',
                                            "timeout",
                                            "TIMEOUT",
                                            gettext_noop ("how long should the monitor command run"),
                                            &timeout_request),
-  
    GNUNET_GETOPT_option_flag ('V',
                                  "verbose",
                                  gettext_noop ("be verbose (print progress information)"),
                                  &verbose),
-  
    GNUNET_GETOPT_OPTION_END
  };
diff --git a/src/dht/gnunet-dht-put.c b/src/dht/gnunet-dht-put.c
index db4d04681..fd784871d 100644
--- a/src/dht/gnunet-dht-put.c
+++ b/src/dht/gnunet-dht-put.c
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009, 2017 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
 * @file dht/gnunet-dht-put.c
diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c
index 829c53aea..f9d705873 100644
--- a/src/dht/gnunet-service-dht.c
+++ b/src/dht/gnunet-service-dht.c
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/dht/gnunet-service-dht.h b/src/dht/gnunet-service-dht.h
index 8b0602104..fa5aa7a55 100644
--- a/src/dht/gnunet-service-dht.h
+++ b/src/dht/gnunet-service-dht.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009-2016 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c
index 503d7867b..862654c83 100644
--- a/src/dht/gnunet-service-dht_clients.c
+++ b/src/dht/gnunet-service-dht_clients.c
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009, 2010, 2011, 2016, 2017 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/dht/gnunet-service-dht_datacache.c b/src/dht/gnunet-service-dht_datacache.c
index 36047d561..7ad9aa728 100644
--- a/src/dht/gnunet-service-dht_datacache.c
+++ b/src/dht/gnunet-service-dht_datacache.c
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009, 2010, 2011, 2015, 2017 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
 * @file dht/gnunet-service-dht_datacache.c
@@ -26,6 +24,7 @@
 #include "platform.h"
 #include "gnunet_datacache_lib.h"
 #include "gnunet-service-dht_datacache.h"
+#include "gnunet-service-dht_neighbours.h"
 #include "gnunet-service-dht_routing.h"
 #include "gnunet-service-dht.h"
@@ -79,10 +78,13 @@ GDS_DATACACHE_handle_put (struct GNUNET_TIME_Absolute expiration,
  }
  /* Put size is actual data size plus struct overhead plus path length (if any) */
  GNUNET_STATISTICS_update (GDS_stats,
-                            gettext_noop ("# ITEMS stored in datacache"), 1,
+                            gettext_noop ("# ITEMS stored in datacache"),
+                            1,
                            GNUNET_NO);
  r = GNUNET_DATACACHE_put (datacache,
                            key,
+                            GNUNET_CRYPTO_hash_matching_bits (key,
+                                                              &my_identity_hash),
                            data_size,
                            data,
                            type,
@@ -169,6 +171,11 @@ datacache_get_iterator (void *cls,
  struct GetRequestContext *ctx = cls;
  enum GNUNET_BLOCK_EvaluationResult eval;
+  if (0 == GNUNET_TIME_absolute_get_remaining (exp).rel_value_us)
+  {
+    GNUNET_break (0); /* why does datacache return expired values? */
+    return GNUNET_OK; /* skip expired record */
+  }
  if ( (NULL == data) &&
       (0 == data_size) )
    data = &non_null; /* point anywhere, but not to NULL */
diff --git a/src/dht/gnunet-service-dht_datacache.h b/src/dht/gnunet-service-dht_datacache.h
index ff6ae23da..6f65982a5 100644
--- a/src/dht/gnunet-service-dht_datacache.h
+++ b/src/dht/gnunet-service-dht_datacache.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009, 2010, 2011 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/dht/gnunet-service-dht_hello.c b/src/dht/gnunet-service-dht_hello.c
index 5a5c41567..142d44bcc 100644
--- a/src/dht/gnunet-service-dht_hello.c
+++ b/src/dht/gnunet-service-dht_hello.c
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2011 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/dht/gnunet-service-dht_hello.h b/src/dht/gnunet-service-dht_hello.h
index 8d9b940ad..41351da34 100644
--- a/src/dht/gnunet-service-dht_hello.h
+++ b/src/dht/gnunet-service-dht_hello.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2011 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c
index 0309bea88..56639448f 100644
--- a/src/dht/gnunet-service-dht_neighbours.c
+++ b/src/dht/gnunet-service-dht_neighbours.c
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009-2017 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -404,7 +402,7 @@ static struct GNUNET_PeerIdentity my_identity;
 /**
 * Hash of the identity of this peer.
 */
-static struct GNUNET_HashCode my_identity_hash;
+struct GNUNET_HashCode my_identity_hash;
 /**
 * Handle to CORE.
@@ -421,7 +419,7 @@ static struct GNUNET_ATS_ConnectivityHandle *ats_ch;
 * Find the optimal bucket for this key.
 *
 * @param hc the hashcode to compare our identity to
- * @return the proper bucket index, or GNUNET_SYSERR
+ * @return the proper bucket index, or #GNUNET_SYSERR
 *         on error (same hashcode)
 */
 static int
@@ -470,6 +468,7 @@ free_connect_info (void *cls,
 {
  struct ConnectInfo *ci = value;
+ (void) cls;
  GNUNET_assert (GNUNET_YES ==
                 GNUNET_CONTAINER_multipeermap_remove (all_desired_peers,
                                                       peer,
@@ -581,7 +580,10 @@ update_desire_strength (void *cls,
                        const struct GNUNET_PeerIdentity *pid,
                        void *value)
 {
-  try_connect (pid, NULL);
+  (void) cls;
+  (void) value;
+  try_connect (pid,
+               NULL);
  return GNUNET_YES;
 }
@@ -618,6 +620,8 @@ add_known_to_bloom (void *cls,
  struct GNUNET_BLOCK_Group *bg = cls;
  struct GNUNET_HashCode key_hash;
+ (void) cls;
+ (void) value;
  GNUNET_CRYPTO_hash (key,
                      sizeof (struct GNUNET_PeerIdentity),
                      &key_hash);
@@ -645,7 +649,8 @@ send_find_peer_message (void *cls)
  struct GNUNET_BLOCK_Group *bg;
  struct GNUNET_CONTAINER_BloomFilter *peer_bf;
-  find_peer_task = NULL;
+ (void) cls;
+ find_peer_task = NULL;
  if (newly_found_peers > bucket_size)
  {
    /* If we are finding many peers already, no need to send out our request right now! */
@@ -718,7 +723,8 @@ handle_core_connect (void *cls,
 {
  struct PeerInfo *pi;
-  /* Check for connect to self message */
+ (void) cls;
+ /* Check for connect to self message */
  if (0 == memcmp (&my_identity,
                   peer,
                   sizeof (struct GNUNET_PeerIdentity)))
@@ -741,13 +747,13 @@ handle_core_connect (void *cls,
                      &pi->phash);
  pi->peer_bucket = find_bucket (&pi->phash);
  GNUNET_assert ( (pi->peer_bucket >= 0) &&
-                  (pi->peer_bucket < MAX_BUCKETS) );
+                  ((unsigned int) pi->peer_bucket < MAX_BUCKETS) );
  GNUNET_CONTAINER_DLL_insert_tail (k_buckets[pi->peer_bucket].head,
                                    k_buckets[pi->peer_bucket].tail,
                                    pi);
  k_buckets[pi->peer_bucket].peers_size++;
  closest_bucket = GNUNET_MAX (closest_bucket,
-                               pi->peer_bucket);
+                               (unsigned int) pi->peer_bucket);
  GNUNET_assert (GNUNET_OK ==
                 GNUNET_CONTAINER_multipeermap_put (all_connected_peers,
                                                    pi->id,
@@ -785,6 +791,7 @@ handle_core_disconnect (void *cls,
 {
  struct PeerInfo *to_remove = internal_cls;
+  (void) cls;
  /* Check for disconnect from self message */
  if (NULL == to_remove)
    return;
@@ -941,30 +948,30 @@ get_distance (const struct GNUNET_HashCode *target,
 * @return #GNUNET_YES if node location is closest,
 *         #GNUNET_NO otherwise.
 */
-static int
+int
-am_closest_peer (const struct GNUNET_HashCode *key,
+GDS_am_closest_peer (const struct GNUNET_HashCode *key,
-                 const struct GNUNET_CONTAINER_BloomFilter *bloom)
+                     const struct GNUNET_CONTAINER_BloomFilter *bloom)
 {
  int bits;
  int other_bits;
  int bucket_num;
-  int count;
  struct PeerInfo *pos;
-  if (0 == memcmp (&my_identity_hash, key, sizeof (struct GNUNET_HashCode)))
+  if (0 == memcmp (&my_identity_hash,
+                   key,
+                   sizeof (struct GNUNET_HashCode)))
    return GNUNET_YES;
  bucket_num = find_bucket (key);
  GNUNET_assert (bucket_num >= 0);
  bits = GNUNET_CRYPTO_hash_matching_bits (&my_identity_hash,
                                           key);
  pos = k_buckets[bucket_num].head;
-  count = 0;
+  while (NULL != pos) 
-  while ((NULL != pos) && (count < bucket_size))
  {
-    if ((NULL != bloom) &&
+    if ( (NULL != bloom) &&
-        (GNUNET_YES ==
+         (GNUNET_YES ==
-         GNUNET_CONTAINER_bloomfilter_test (bloom,
+          GNUNET_CONTAINER_bloomfilter_test (bloom,
-                                            &pos->phash)))
+                                             &pos->phash)) )
    {
      pos = pos->next;
      continue;                 /* Skip already checked entries */
@@ -1596,6 +1603,7 @@ static void
 core_init (void *cls,
           const struct GNUNET_PeerIdentity *identity)
 {
+  (void) cls;
  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
              "CORE called, I am %s\n",
              GNUNET_i2s (identity));
@@ -1621,6 +1629,7 @@ check_dht_p2p_put (void *cls,
  uint32_t putlen;
  uint16_t msize;
+  (void) cls;
  msize = ntohs (put->header.size);
  putlen = ntohl (put->put_path_length);
  if ((msize <
@@ -1656,7 +1665,17 @@ handle_dht_p2p_put (void *cls,
  struct GNUNET_CONTAINER_BloomFilter *bf;
  struct GNUNET_HashCode test_key;
  int forwarded;
+  struct GNUNET_TIME_Absolute exp_time;
+  exp_time = GNUNET_TIME_absolute_ntoh (put->expiration_time);
+  if (0 == GNUNET_TIME_absolute_get_remaining (exp_time).rel_value_us)
+  {
+    GNUNET_STATISTICS_update (GDS_stats,
+                              gettext_noop ("# Expired PUTs discarded"),
+                              1,
+                              GNUNET_NO);
+    return;
+  }
  msize = ntohs (put->header.size);
  putlen = ntohl (put->put_path_length);
  GNUNET_STATISTICS_update (GDS_stats,
@@ -1792,7 +1811,7 @@ handle_dht_p2p_put (void *cls,
      putlen = 0;
    /* give to local clients */
-    GDS_CLIENTS_handle_reply (GNUNET_TIME_absolute_ntoh (put->expiration_time),
+    GDS_CLIENTS_handle_reply (exp_time,
                              &put->key,
                              0,
                              NULL,
@@ -1803,8 +1822,8 @@ handle_dht_p2p_put (void *cls,
                              payload);
    /* store locally */
    if ((0 != (options & GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE)) ||
-        (am_closest_peer (&put->key, bf)))
+        (GDS_am_closest_peer (&put->key, bf)))
-      GDS_DATACACHE_handle_put (GNUNET_TIME_absolute_ntoh (put->expiration_time),
+      GDS_DATACACHE_handle_put (exp_time,
                                &put->key,
                                putlen,
                                pp,
@@ -1815,7 +1834,7 @@ handle_dht_p2p_put (void *cls,
    forwarded = GDS_NEIGHBOURS_handle_put (ntohl (put->type),
                                           options,
                                           ntohl (put->desired_replication_level),
-                                           GNUNET_TIME_absolute_ntoh (put->expiration_time),
+                                           exp_time,
                                           ntohl (put->hop_count),
                                           bf,
                                           &put->key,
@@ -1832,7 +1851,7 @@ handle_dht_p2p_put (void *cls,
                             ntohl (put->hop_count),
                             ntohl (put->desired_replication_level),
                             putlen, pp,
-                             GNUNET_TIME_absolute_ntoh (put->expiration_time),
+                             exp_time,
                             &put->key,
                             payload,
                             payload_size);
@@ -1909,9 +1928,9 @@ handle_find_peer (const struct GNUNET_PeerIdentity *sender,
                   sizeof (struct GNUNET_HashCode)))
    bucket_idx = closest_bucket;
  else
-    bucket_idx = GNUNET_MIN (closest_bucket,
+    bucket_idx = GNUNET_MIN ((int) closest_bucket,
                             find_bucket (key));
-  if (bucket_idx == GNUNET_SYSERR)
+  if (bucket_idx < 0)
    return;
  bucket = &k_buckets[bucket_idx];
  if (bucket->peers_size == 0)
@@ -2018,6 +2037,7 @@ check_dht_p2p_get (void *cls,
  uint32_t xquery_size;
  uint16_t msize;
+  (void) cls;
  msize = ntohs (get->header.size);
  xquery_size = ntohl (get->xquery_size);
  if (msize < sizeof (struct PeerGetMessage) + xquery_size)
@@ -2122,7 +2142,7 @@ handle_dht_p2p_get (void *cls,
              (unsigned int) ntohl (get->hop_count));
  /* local lookup (this may update the reply_bf) */
  if ((0 != (options & GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE)) ||
-      (am_closest_peer (&get->key,
+      (GDS_am_closest_peer (&get->key,
                        peer_bf)))
  {
    if ((0 != (options & GNUNET_DHT_RO_FIND_PEER)))
@@ -2205,6 +2225,7 @@ check_dht_p2p_result (void *cls,
  uint32_t put_path_length;
  uint16_t msize;
+  (void) cls;
  msize = ntohs (prm->header.size);
  put_path_length = ntohl (prm->put_path_length);
  get_path_length = ntohl (prm->get_path_length);
@@ -2318,8 +2339,18 @@ handle_dht_p2p_result (void *cls,
  uint16_t msize;
  size_t data_size;
  enum GNUNET_BLOCK_Type type;
+  struct GNUNET_TIME_Absolute exp_time;
  /* parse and validate message */
+  exp_time = GNUNET_TIME_absolute_ntoh (prm->expiration_time);
+  if (0 == GNUNET_TIME_absolute_get_remaining (exp_time).rel_value_us)
+  {
+    GNUNET_STATISTICS_update (GDS_stats,
+                              gettext_noop ("# Expired results discarded"),
+                              1,
+                              GNUNET_NO);
+    return;
+  }
  msize = ntohs (prm->header.size);
  put_path_length = ntohl (prm->put_path_length);
  get_path_length = ntohl (prm->get_path_length);
@@ -2393,7 +2424,6 @@ handle_dht_p2p_result (void *cls,
                   h);
  }
  /* First, check if 'peer' is already on the path, and if
     so, truncate it instead of expanding. */
  for (unsigned int i=0;i<=get_path_length;i++)
@@ -2401,7 +2431,7 @@ handle_dht_p2p_result (void *cls,
                     peer->id,
                     sizeof (struct GNUNET_PeerIdentity)))
    {
-      process_reply_with_path (GNUNET_TIME_absolute_ntoh (prm->expiration_time),
+      process_reply_with_path (exp_time,
                               &prm->key,
                               i,
                               get_path,
@@ -2422,7 +2452,7 @@ handle_dht_p2p_result (void *cls,
                   get_path_length * sizeof (struct GNUNET_PeerIdentity));
    xget_path[get_path_length] = *peer->id;
-    process_reply_with_path (GNUNET_TIME_absolute_ntoh (prm->expiration_time),
+    process_reply_with_path (exp_time,
                             &prm->key,
                             get_path_length + 1,
                             xget_path,
diff --git a/src/dht/gnunet-service-dht_neighbours.h b/src/dht/gnunet-service-dht_neighbours.h
index 34b76ee8a..fb740c766 100644
--- a/src/dht/gnunet-service-dht_neighbours.h
+++ b/src/dht/gnunet-service-dht_neighbours.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009, 2010, 2011 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -32,6 +30,12 @@
 #include "gnunet_dht_service.h"
 /**
+ * Hash of the identity of this peer.
+ */
+extern struct GNUNET_HashCode my_identity_hash;
+/**
 * Perform a PUT operation.  Forwards the given request to other
 * peers.   Does not store the data locally.  Does not give the
 * data to local clients.  May do nothing if this is the only
@@ -123,6 +127,22 @@ GDS_NEIGHBOURS_handle_reply (const struct GNUNET_PeerIdentity *target,
 /**
+ * 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 key 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.
+ */
+int
+GDS_am_closest_peer (const struct GNUNET_HashCode *key,
+                     const struct GNUNET_CONTAINER_BloomFilter *bloom);
+/**
 * Initialize neighbours subsystem.
 *
 * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
diff --git a/src/dht/gnunet-service-dht_nse.c b/src/dht/gnunet-service-dht_nse.c
index da4aae60c..446ae2dbd 100644
--- a/src/dht/gnunet-service-dht_nse.c
+++ b/src/dht/gnunet-service-dht_nse.c
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009, 2010, 2011 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/dht/gnunet-service-dht_nse.h b/src/dht/gnunet-service-dht_nse.h
index 075a872b3..a5e259cba 100644
--- a/src/dht/gnunet-service-dht_nse.h
+++ b/src/dht/gnunet-service-dht_nse.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2011 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/dht/gnunet-service-dht_routing.c b/src/dht/gnunet-service-dht_routing.c
index 098b6e895..0098ce096 100644
--- a/src/dht/gnunet-service-dht_routing.c
+++ b/src/dht/gnunet-service-dht_routing.c
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2011 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/dht/gnunet-service-dht_routing.h b/src/dht/gnunet-service-dht_routing.h
index ad7958363..d9c0345b6 100644
--- a/src/dht/gnunet-service-dht_routing.h
+++ b/src/dht/gnunet-service-dht_routing.h
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2011 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
diff --git a/src/dht/gnunet_dht_profiler.c b/src/dht/gnunet_dht_profiler.c
index a8807bea8..a729d1b01 100644
--- a/src/dht/gnunet_dht_profiler.c
+++ b/src/dht/gnunet_dht_profiler.c
@@ -1,21 +1,19 @@
 /*
     This file is part of GNUnet.
-     Copyright (C) 2014 GNUnet e.V.
+     Copyright (C) 2014, 2018 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -28,9 +26,11 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
 #include "gnunet_dht_service.h"
+#include "gnunet_constants.h"
-#define INFO(...)                                       \
+#define MESSAGE(...)                                       \
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, __VA_ARGS__)
+  GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, __VA_ARGS__)
 #define DEBUG(...)                                           \
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
@@ -38,12 +38,12 @@
 /**
 * Number of peers which should perform a PUT out of 100 peers
 */
-#define PUT_PROBABILITY 50
+static unsigned int put_probability = 100;
 /**
 * Configuration
 */
-static struct GNUNET_CONFIGURATION_Handle *cfg;
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
 /**
 * Name of the file with the hosts to run the test over
@@ -94,11 +94,6 @@ struct ActiveContext
  struct GNUNET_DHT_Handle *dht;
  /**
-   * The data used for do a PUT.  Will be NULL if a PUT hasn't been performed yet
-   */
-  void *put_data;
-  /**
   * The active context used for our DHT GET
   */
  struct ActiveContext *get_ac;
@@ -114,19 +109,20 @@ struct ActiveContext
  struct GNUNET_DHT_GetHandle *dht_get;
  /**
-   * The hash of the @e put_data
+   * The hashes of the values stored via this activity context.
+   * Array of length #num_puts_per_peer.
   */
-  struct GNUNET_HashCode hash;
+  struct GNUNET_HashCode *hash;
  /**
   * Delay task
   */
-  struct GNUNET_SCHEDULER_Task * delay_task;
+  struct GNUNET_SCHEDULER_Task *delay_task;
  /**
-   * The size of the @e put_data
+   * How many puts should we still issue?
   */
-  uint16_t put_data_size;
+  unsigned int put_count;
  /**
   * The number of peers currently doing GET on our data
@@ -183,17 +179,17 @@ static unsigned int n_dht;
 /**
 * Number of DHT PUTs made
 */
-static unsigned int n_puts;
+static unsigned long long n_puts;
 /**
- * Number of DHT PUTs succeeded
+ * Number of DHT PUTs to be made per peer.
 */
-static unsigned int n_puts_ok;
+static unsigned int num_puts_per_peer = 1;
 /**
- * Number of DHT PUTs failed
+ * Number of DHT PUTs succeeded
 */
-static unsigned int n_puts_fail;
+static unsigned long long n_puts_ok;
 /**
 * Number of DHT GETs made
@@ -216,21 +212,11 @@ static unsigned int n_gets_fail;
 static unsigned int replication;
 /**
- * Number of times we try to find the successor circle formation
- */
-static unsigned int max_searches;
-/**
 * Testbed Operation (to get stats).
 */
 static struct GNUNET_TESTBED_Operation *bandwidth_stats_op;
 /**
- * To get successor stats.
- */
-static struct GNUNET_TESTBED_Operation *successor_stats_op;
-/**
 * Testbed peer handles.
 */
 static struct GNUNET_TESTBED_Peer **testbed_handles;
@@ -266,47 +252,6 @@ static unsigned int total_put_path_length;
 static unsigned int total_get_path_length;
 /**
- * Hashmap to store pair of peer and its corresponding successor.
- */
-static struct GNUNET_CONTAINER_MultiHashMap *successor_peer_hashmap;
-/**
- * Key to start the lookup on successor_peer_hashmap.
- */
-static struct GNUNET_HashCode *start_key;
-/**
- * Flag used to get the start_key.
- */
-static int flag = 0;
-/**
- * Task to collect peer and its current successor statistics.
- */
-static struct GNUNET_SCHEDULER_Task * successor_stats_task;
-/**
- * Closure for successor_stats_task.
- */
-struct Collect_Stat_Context
-{
-  /**
-   * Current Peer Context.
-   */
-  struct Context *service_connect_ctx;
-  /**
-   * Testbed operation acting on this peer
-   */
-  struct GNUNET_TESTBED_Operation *op;
-};
-/**
- * List of all the peers contexts.
- */
-struct Context **peer_contexts = NULL;
-/**
 * Counter to keep track of peers added to peer_context lists.
 */
 static int peers_started = 0;
@@ -327,20 +272,6 @@ static enum
 */
 static int in_shutdown = 0;
-/**
- * Total number of times to check if circle is formed or not.
- */
-static unsigned int tries;
-/**
- * Task that collects successor statistics from all the peers.
- *
- * @param cls
- */
-static void
-collect_stats (void *cls);
 /**
 * Connect to DHT services of active peers
@@ -358,12 +289,11 @@ static void
 do_shutdown (void *cls)
 {
  struct ActiveContext *ac;
-  unsigned int cnt;
  in_shutdown = GNUNET_YES;
  if (NULL != a_ctx)
  {
-    for (cnt=0; cnt < num_peers; cnt++)
+    for (unsigned int cnt=0; cnt < num_peers; cnt++)
    {
      /* Cleanup active context if this peer is an active peer */
      ac = a_ctx[cnt].ac;
@@ -371,8 +301,8 @@ do_shutdown (void *cls)
      {
        if (NULL != ac->delay_task)
          GNUNET_SCHEDULER_cancel (ac->delay_task);
-        if (NULL != ac->put_data)
+        if (NULL != ac->hash)
-          GNUNET_free (ac->put_data);
+          free (ac->hash);
        if (NULL != ac->dht_put)
          GNUNET_DHT_put_cancel (ac->dht_put);
        if (NULL != ac->dht_get)
@@ -392,16 +322,6 @@ do_shutdown (void *cls)
    GNUNET_TESTBED_operation_done (bandwidth_stats_op);
    bandwidth_stats_op = NULL;
  }
-  if (NULL != successor_stats_op)
-  {
-    GNUNET_TESTBED_operation_done (successor_stats_op);
-    successor_stats_op = NULL;
-  }
-  if (NULL != successor_stats_task)
-  {
-    GNUNET_SCHEDULER_cancel (successor_stats_task);
-    successor_stats_task = NULL;
-  }
  GNUNET_free_non_null (a_ac);
 }
@@ -420,10 +340,13 @@ bandwidth_stats_cont (void *cls,
                      struct GNUNET_TESTBED_Operation *op,
                      const char *emsg)
 {
-  INFO ("# Outgoing bandwidth: %llu\n",
+  MESSAGE ("# Outgoing (core) bandwidth: %llu bytes\n",
-        (unsigned long long) outgoing_bandwidth);
+           (unsigned long long) outgoing_bandwidth);
-  INFO ("# Incoming bandwidth: %llu\n",
+  MESSAGE ("# Incoming (core) bandwidth: %llu bytes\n",
-        (unsigned long long) incoming_bandwidth);
+           (unsigned long long) incoming_bandwidth);
+  fprintf (stderr,
+           "Benchmark done. Collect data via gnunet-statistics, then press ENTER to exit.\n");
+  (void) getchar ();
  GNUNET_SCHEDULER_shutdown ();
 }
@@ -447,40 +370,48 @@ bandwidth_stats_iterator (void *cls,
                          uint64_t value,
                          int is_persistent)
 {
-   static const char *s_sent = "# Bytes transmitted to other peers";
+  static const char *s_sent = "# bytes encrypted";
-   static const char *s_recv = "# Bytes received from other peers";
+  static const char *s_recv = "# bytes decrypted";
-   if (0 == strncmp (s_sent, name, strlen (s_sent)))
+  if (0 == strncmp (s_sent, name, strlen (s_sent)))
-     outgoing_bandwidth = outgoing_bandwidth + value;
+    outgoing_bandwidth = outgoing_bandwidth + value;
-   else if (0 == strncmp(s_recv, name, strlen (s_recv)))
+  else if (0 == strncmp(s_recv, name, strlen (s_recv)))
-     incoming_bandwidth = incoming_bandwidth + value;
+    incoming_bandwidth = incoming_bandwidth + value;
+  return GNUNET_OK;
-    return GNUNET_OK;
 }
 static void
 summarize ()
 {
-  INFO ("# PUTS made: %u\n", n_puts);
+  MESSAGE ("# PUTS started: %llu\n",
-  INFO ("# PUTS succeeded: %u\n", n_puts_ok);
+        n_puts);
-  INFO ("# PUTS failed: %u\n", n_puts_fail);
+  MESSAGE ("# PUTS succeeded: %llu\n",
-  INFO ("# GETS made: %u\n", n_gets);
+        n_puts_ok);
-  INFO ("# GETS succeeded: %u\n", n_gets_ok);
+  MESSAGE ("# GETS made: %u\n",
-  INFO ("# GETS failed: %u\n", n_gets_fail);
+        n_gets);
-  INFO ("# average_put_path_length: %f\n", average_put_path_length);
+  MESSAGE ("# GETS succeeded: %u\n",
-  INFO ("# average_get_path_length: %f\n", average_get_path_length);
+        n_gets_ok);
+  MESSAGE ("# GETS failed: %u\n",
+        n_gets_fail);
+  MESSAGE ("# average_put_path_length: %f\n",
+        average_put_path_length);
+  MESSAGE ("# average_get_path_length: %f\n",
+        average_get_path_length);
  if (NULL == testbed_handles)
  {
-    INFO ("No peers found\n");
+    MESSAGE ("No peers found\n");
    return;
  }
  /* Collect Stats*/
-  bandwidth_stats_op = GNUNET_TESTBED_get_statistics (n_active, testbed_handles,
+  bandwidth_stats_op = GNUNET_TESTBED_get_statistics (n_active,
-                                                      "dht", NULL,
+                                                      testbed_handles,
-                                                       bandwidth_stats_iterator,
+                                                      "core",
-                                                       bandwidth_stats_cont, NULL);
+                                                      NULL,
+                                                      &bandwidth_stats_iterator,
+                                                      &bandwidth_stats_cont,
+                                                      NULL);
 }
@@ -546,10 +477,9 @@ get_iter (void *cls,
  struct ActiveContext *get_ac = ac->get_ac;
  struct Context *ctx = ac->ctx;
-  /* Check the keys of put and get match or not. */
-  GNUNET_assert (0 == memcmp (key, &get_ac->hash, sizeof (struct GNUNET_HashCode)));
  /* we found the data we are looking for */
-  DEBUG ("We found a GET request; %u remaining\n", n_gets - (n_gets_fail + n_gets_ok)); //FIXME: It always prints 1.
+  DEBUG ("We found a GET request; %u remaining\n",
+         n_gets - (n_gets_fail + n_gets_ok)); //FIXME: It always prints 1.
  n_gets_ok++;
  get_ac->nrefs--;
  GNUNET_DHT_get_stop (ac->dht_get);
@@ -591,79 +521,69 @@ delayed_get (void *cls)
  get_ac = NULL;
  while (1)
  {
-    r = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, n_active);
+    r = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+                                  n_active);
    get_ac = &a_ac[r];
-    if (NULL != get_ac->put_data)
+    if (NULL != get_ac->hash)
      break;
  }
  get_ac->nrefs++;
  ac->get_ac = get_ac;
-  DEBUG ("GET_REQUEST_START key %s \n", GNUNET_h2s((struct GNUNET_HashCode *)ac->put_data));
+  r = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+                                num_puts_per_peer);
+  DEBUG ("GET_REQUEST_START key %s \n",
+         GNUNET_h2s(&get_ac->hash[r]));
  ac->dht_get = GNUNET_DHT_get_start (ac->dht,
                                      GNUNET_BLOCK_TYPE_TEST,
-                                      &get_ac->hash,
+                                      &get_ac->hash[r],
                                      1, /* replication level */
                                      GNUNET_DHT_RO_NONE,
-                                      NULL, 0, /* extended query and size */
+                                      NULL,
-                                      get_iter, ac); /* GET iterator and closure
+                                      0, /* extended query and size */
-                                                        */
+                                      &get_iter,
+                                      ac); /* GET iterator and closure */
  n_gets++;
  /* schedule the timeout task for GET */
-  ac->delay_task = GNUNET_SCHEDULER_add_delayed (timeout, &cancel_get, ac);
+  ac->delay_task = GNUNET_SCHEDULER_add_delayed (timeout,
+                                                 &cancel_get,
+                                                 ac);
 }
 /**
- * Task to teardown the dht connection.  We do it as a task because calling
+ * Task to do DHT PUTs.  If the "put_count" hits zero,
- * GNUNET_DHT_disconnect() from put_continutation_callback seems illegal (the
+ * we stop the TESTBED operation (connection to DHT)
- * put_continuation_callback() is getting called again synchronously).  Also,
+ * so that others PUTs have a chance.
- * only free the operation when we are not shutting down; the shutdown task will
- * clear the operation during shutdown.
 *
- * @param cls the context
+ * @param cls the active context
 */
 static void
-teardown_dht_connection (void *cls)
+delayed_put (void *cls);
-{
-  struct Context *ctx = cls;
-  struct GNUNET_TESTBED_Operation *op;
-  GNUNET_assert (NULL != ctx);
-  GNUNET_assert (NULL != (op = ctx->op));
-  ctx->op = NULL;
-  GNUNET_TESTBED_operation_done (op);
-}
 /**
- * Queue up a delayed task for doing DHT GET
+ * Conclude individual PUT operation, schedule the
+ * next one.
 *
 * @param cls the active context
- * @param success #GNUNET_OK if the PUT was transmitted,
- *                #GNUNET_NO on timeout,
- *                #GNUNET_SYSERR on disconnect from service
- *                after the PUT message was transmitted
- *                (so we don't know if it was received or not)
 */
 static void
-put_cont (void *cls, int success)
+put_cont (void *cls)
 {
  struct ActiveContext *ac = cls;
-  struct Context *ctx = ac->ctx;
  ac->dht_put = NULL;
-  if (success)
+  n_puts_ok++;
-    n_puts_ok++;
+  ac->delay_task = GNUNET_SCHEDULER_add_now (&delayed_put,
-  else
+                                             ac);
-    n_puts_fail++;
-  GNUNET_assert (NULL != ctx);
-  (void) GNUNET_SCHEDULER_add_now (&teardown_dht_connection, ctx);
 }
 /**
- * Task to do DHT PUTs
+ * Task to do DHT PUTs.  If the "put_count" hits zero,
+ * we stop the TESTBED operation (connection to DHT)
+ * so that others PUTs have a chance.
 *
 * @param cls the active context
 */
@@ -671,27 +591,47 @@ static void
 delayed_put (void *cls)
 {
  struct ActiveContext *ac = cls;
+  char block[65536];
+  size_t block_size;
  ac->delay_task = NULL;
+  if (0 == ac->put_count)
+  {
+    struct Context *ctx = ac->ctx;
+    struct GNUNET_TESTBED_Operation *op;
+    GNUNET_assert (NULL != ctx);
+    op = ctx->op;
+    ctx->op = NULL;
+    GNUNET_TESTBED_operation_done (op);
+    return;
+  }
  /* Generate and DHT PUT some random data */
-  ac->put_data_size = 16;       /* minimum */
+  block_size = 16; /* minimum */
-  ac->put_data_size += GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+  /* make random payload, reserve 512 - 16 bytes for DHT headers */
-                                                 (63*1024));
+  block_size += GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
-  ac->put_data = GNUNET_malloc (ac->put_data_size);
+                                          GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE - 512);
  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
-                              ac->put_data, ac->put_data_size);
+                              block,
-  GNUNET_CRYPTO_hash (ac->put_data, ac->put_data_size, &ac->hash);
+                              block_size);
+  ac->put_count--;
+  GNUNET_CRYPTO_hash (block,
+                      block_size,
+                      &ac->hash[ac->put_count]);
  DEBUG ("PUT_REQUEST_START key %s\n",
-         GNUNET_h2s((struct GNUNET_HashCode *)ac->put_data));
+         GNUNET_h2s (&ac->hash[ac->put_count]));
  ac->dht_put = GNUNET_DHT_put (ac->dht,
-                                &ac->hash,
+                                &ac->hash[ac->put_count],
                                replication,
                                GNUNET_DHT_RO_RECORD_ROUTE,
                                GNUNET_BLOCK_TYPE_TEST,
-                                ac->put_data_size,
+                                block_size,
-                                ac->put_data,
+                                block,
                                GNUNET_TIME_UNIT_FOREVER_ABS, /* expiration time */
-                                &put_cont, ac);                /* continuation and its closure */
+                                &put_cont,
+                                ac);                /* continuation and its closure */
  n_puts++;
 }
@@ -720,7 +660,9 @@ dht_connected (void *cls,
  ac->dht = (struct GNUNET_DHT_Handle *) ca_result;
  if (NULL != emsg)
  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Connection to DHT service failed: %s\n", emsg);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Connection to DHT service failed: %s\n",
+                emsg);
    GNUNET_TESTBED_operation_done (ctx->op); /* Calls dht_disconnect() */
    ctx->op = NULL;
    return;
@@ -728,24 +670,40 @@ dht_connected (void *cls,
  switch (mode)
  {
  case MODE_PUT:
-  {
+    {
-    struct GNUNET_TIME_Relative peer_delay_put;
+      struct GNUNET_TIME_Relative peer_delay_put;
-    peer_delay_put.rel_value_us =
-      GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
+      peer_delay_put.rel_value_us =
-                                delay_put.rel_value_us);
+        GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
-    ac->delay_task = GNUNET_SCHEDULER_add_delayed (peer_delay_put, &delayed_put, ac);
+                                  delay_put.rel_value_us);
-    break;
+      ac->put_count = num_puts_per_peer;
-  }
+      ac->hash = calloc (ac->put_count,
+                         sizeof (struct GNUNET_HashCode));
+      if (NULL == ac->hash)
+      {
+        GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
+                             "calloc");
+        GNUNET_SCHEDULER_shutdown ();
+        return;
+      }
+      ac->delay_task = GNUNET_SCHEDULER_add_delayed (peer_delay_put,
+                                                     &delayed_put,
+                                                     ac);
+      break;
+    }
  case MODE_GET:
-  {
+    {
-    struct GNUNET_TIME_Relative peer_delay_get;
+      struct GNUNET_TIME_Relative peer_delay_get;
-    peer_delay_get.rel_value_us =
-      delay_get.rel_value_us +
+      peer_delay_get.rel_value_us =
-      GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
+        delay_get.rel_value_us +
-                                delay_get.rel_value_us);
+        GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
-    ac->delay_task = GNUNET_SCHEDULER_add_delayed (peer_delay_get, &delayed_get, ac);
+                                  delay_get.rel_value_us);
-    break;
+      ac->delay_task = GNUNET_SCHEDULER_add_delayed (peer_delay_get,
-  }
+                                                     &delayed_get,
+                                                     ac);
+      break;
+    }
  }
 }
@@ -760,10 +718,12 @@ dht_connected (void *cls,
 * @return service handle to return in 'op_result', NULL on error
 */
 static void *
-dht_connect (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
+dht_connect (void *cls,
+             const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
  n_dht++;
-  return GNUNET_DHT_connect (cfg, 10);
+  return GNUNET_DHT_connect (cfg,
+                             10);
 }
@@ -775,7 +735,8 @@ dht_connect (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
 * @param op_result service handle returned from the connect adapter
 */
 static void
-dht_disconnect (void *cls, void *op_result)
+dht_disconnect (void *cls,
+                void *op_result)
 {
  struct ActiveContext *ac = cls;
@@ -791,11 +752,10 @@ dht_disconnect (void *cls, void *op_result)
  switch (mode)
  {
  case MODE_PUT:
-    if ((n_puts_ok + n_puts_fail) != n_active)
+    if (n_puts_ok != ((unsigned long long) n_active) * num_puts_per_peer)
      return;
    /* Start GETs if all PUTs have been made */
    mode = MODE_GET;
-    //(void) GNUNET_SCHEDULER_add_now (&call_start_profiling, NULL);
    start_profiling ();
    return;
  case MODE_GET:
@@ -805,6 +765,7 @@ dht_disconnect (void *cls, void *op_result)
  }
 }
 /**
 * Connect to DHT services of active peers
 */
@@ -812,229 +773,22 @@ static void
 start_profiling()
 {
  struct Context *ctx;
-  unsigned int i;
-  DEBUG("GNUNET_TESTBED_service_connect \n");
+  DEBUG ("GNUNET_TESTBED_service_connect\n");
  GNUNET_break (GNUNET_YES != in_shutdown);
-  for(i = 0; i < n_active; i++)
+  for (unsigned int i = 0; i < n_active; i++)
  {
    struct ActiveContext *ac = &a_ac[i];
    GNUNET_assert (NULL != (ctx = ac->ctx));
    GNUNET_assert (NULL == ctx->op);
-    ctx->op =
+    ctx->op = GNUNET_TESTBED_service_connect (ctx,
-        GNUNET_TESTBED_service_connect (ctx,
+                                              ctx->peer,
-                                        ctx->peer,
+                                              "dht",
-                                        "dht",
+                                              &dht_connected, ac,
-                                        &dht_connected, ac,
+                                              &dht_connect,
-                                        &dht_connect,
+                                              &dht_disconnect,
-                                        &dht_disconnect,
+                                              ac);
-                                        ac);
-  }
-}
-/**
- * Start collecting relevant statistics. If ENABLE_MALICIOUS set, first
- * set the malicious peers. If not, then start with PUT operation on active
- * peers.
- */
-static void
-start_func()
-{
-  start_profiling();
-}
-/**
- * Remove entry from successor peer hashmap.
- * @param cls closure
- * @param key current public key
- * @param value value in the hash map
- * @return #GNUNET_YES if we should continue to iterate,
- *         #GNUNET_NO if not.
- */
-static int
-hashmap_iterate_remove(void *cls,
-                       const struct GNUNET_HashCode *key,
-                       void *value)
-{
-  GNUNET_assert (GNUNET_YES ==
-                GNUNET_CONTAINER_multihashmap_remove(successor_peer_hashmap, key, value));
-  return GNUNET_YES;
-}
-/**
- * Stats callback. Iterate over the hashmap and check if all th peers form
- * a virtual ring topology.
- *
- * @param cls closure
- * @param op the operation that has been finished
- * @param emsg error message in case the operation has failed; will be NULL if
- *          operation has executed successfully.
- */
-static void
-successor_stats_cont (void *cls,
-                      struct GNUNET_TESTBED_Operation *op,
-                      const char *emsg)
-{
-  struct GNUNET_HashCode *val;
-  struct GNUNET_HashCode *start_val;
-  struct GNUNET_HashCode *key;
-  int count;
-  /* Don't schedule the task till we are looking for circle here. */
-  successor_stats_task = NULL;
-  GNUNET_TESTBED_operation_done (successor_stats_op);
-  successor_stats_op = NULL;
-  if (0 == max_searches)
-  {
-    start_func ();
-    return;
-  }
-  GNUNET_assert (NULL != start_key);
-  start_val = GNUNET_CONTAINER_multihashmap_get (successor_peer_hashmap,
-                                                 start_key);
-  GNUNET_assert (NULL != start_val);
-  val = start_val;
-  for (count = 0; count < num_peers; count++)
-  {
-    key = val;
-    val = GNUNET_CONTAINER_multihashmap_get (successor_peer_hashmap,
-                                             key);
-    if (NULL == val)
-      break;
-    /* Remove the entry from hashmap. This is done to take care of loop. */
-    if (GNUNET_NO ==
-        GNUNET_CONTAINER_multihashmap_remove (successor_peer_hashmap,
-                                              key, val))
-    {
-      DEBUG ("Failed to remove entry from hashmap\n");
-      break;
-    }
-    /* If a peer has its own identity as its successor. */
-    if (0 == memcmp(key, val, sizeof (struct GNUNET_HashCode)))
-      break;
  }
-  GNUNET_assert (GNUNET_SYSERR !=
-                 GNUNET_CONTAINER_multihashmap_iterate (successor_peer_hashmap,
-                                                        &hashmap_iterate_remove,
-                                                        NULL));
-  successor_peer_hashmap = GNUNET_CONTAINER_multihashmap_create (num_peers,
-                                                                 GNUNET_NO);
-  if ((start_val == val) && (count == num_peers))
-  {
-    DEBUG ("CIRCLE COMPLETED after %u tries", tries);
-    if(NULL == successor_stats_task)
-    {
-      start_func();
-    }
-    return;
-  }
-  if (max_searches == ++tries)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Maximum tries %u exceeded while checking successor TOTAL TRIES %u"
-                " circle formation.  Exiting\n",
-                max_searches,tries);
-    start_func();
-    return;
-  }
-  flag = 0;
-  successor_stats_task
-    = GNUNET_SCHEDULER_add_delayed (delay_stats,
-                                    &collect_stats,
-                                    cls);
-}
-/**
- * Process successor statistic values.
- *
- * @param cls closure
- * @param peer the peer the statistic belong to
- * @param subsystem name of subsystem that created the statistic
- * @param name the name of the datum
- * @param value the current value
- * @param is_persistent GNUNET_YES if the value is persistent, GNUNET_NO if not
- * @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
- */
-static int
-successor_stats_iterator (void *cls,
-                          const struct GNUNET_TESTBED_Peer *peer,
-                          const char *subsystem,
-                          const char *name,
-                          uint64_t value,
-                          int is_persistent)
-{
-  static const char *key_string = "XDHT";
-  if (0 == max_searches)
-    return GNUNET_OK;
-  if (0 == strncmp (key_string, name, strlen (key_string)))
-  {
-    char *my_id_str;
-    char successor_str[13];
-    char truncated_my_id_str[13];
-    char truncated_successor_str[13];
-    struct GNUNET_HashCode *my_id_key;
-    struct GNUNET_HashCode *succ_key;
-    strtok((char *)name,":");
-    my_id_str = strtok(NULL,":");
-    strncpy(truncated_my_id_str, my_id_str, 12);
-    truncated_my_id_str[12] = '\0';
-    my_id_key = GNUNET_new(struct GNUNET_HashCode);
-    GNUNET_CRYPTO_hash (truncated_my_id_str, sizeof(truncated_my_id_str),my_id_key);
-    GNUNET_STRINGS_data_to_string(&value, sizeof(uint64_t), successor_str, 13);
-    strncpy(truncated_successor_str, successor_str, 12);
-    truncated_successor_str[12] ='\0';
-    succ_key = GNUNET_new(struct GNUNET_HashCode);
-    GNUNET_CRYPTO_hash (truncated_successor_str, sizeof(truncated_successor_str),succ_key);
-    if (0 == flag)
-    {
-      GNUNET_assert(NULL != my_id_key);
-      start_key = my_id_key;
-      GNUNET_assert(NULL != start_key);
-      flag = 1;
-    }
-    GNUNET_CONTAINER_multihashmap_put (successor_peer_hashmap,
-                                       my_id_key, (void *)succ_key,
-                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
-  }
-  return GNUNET_OK;
-}
-/*
- * Task that collects peer and its corresponding successors.
- *
- * @param cls Closure (NULL).
- */
-static void
-collect_stats (void *cls)
-{
-  successor_stats_task = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Start collecting statistics...\n");
-  GNUNET_assert(NULL != testbed_handles);
-  if (0 != max_searches)
-    successor_peer_hashmap
-      = GNUNET_CONTAINER_multihashmap_create (num_peers,
-                                              GNUNET_NO);
-  successor_stats_op
-    = GNUNET_TESTBED_get_statistics (num_peers, testbed_handles,
-                                     "dht", NULL,
-                                     successor_stats_iterator,
-                                     successor_stats_cont, cls);
-  GNUNET_assert (NULL != successor_stats_op);
 }
@@ -1058,19 +812,11 @@ service_started (void *cls,
  GNUNET_TESTBED_operation_done (ctx->op);
  ctx->op = NULL;
  peers_started++;
-  DEBUG("Peers Started = %d; num_peers = %d \n", peers_started, num_peers);
+  DEBUG ("Peers Started = %d; num_peers = %d \n",
-  if (NULL == successor_stats_task && peers_started == num_peers)
+         peers_started,
-  {
+         num_peers);
-     DEBUG("successor_stats_task \n");
+  if (peers_started == num_peers)
-     struct Collect_Stat_Context *collect_stat_cls = GNUNET_new(struct Collect_Stat_Context);
+    start_profiling ();
-     collect_stat_cls->service_connect_ctx = cls;
-     collect_stat_cls->op = op;
-     successor_stats_task
-       = GNUNET_SCHEDULER_add_delayed (delay_stats,
-                                       &collect_stats,
-                                       collect_stat_cls);
-  }
 }
@@ -1088,36 +834,42 @@ service_started (void *cls,
 static void
 test_run (void *cls,
          struct GNUNET_TESTBED_RunHandle *h,
-          unsigned int num_peers, struct GNUNET_TESTBED_Peer **peers,
+          unsigned int num_peers,
+          struct GNUNET_TESTBED_Peer **peers,
          unsigned int links_succeeded,
          unsigned int links_failed)
 {
-  unsigned int cnt;
  unsigned int ac_cnt;
  testbed_handles = peers;
  if (NULL == peers)
  {
    /* exit */
    GNUNET_assert (0);
  }
-  INFO ("%u peers started\n", num_peers);
+  MESSAGE ("%u peers started, %u/%u links up\n",
-  a_ctx = GNUNET_malloc (sizeof (struct Context) * num_peers);
+           num_peers,
+           links_succeeded,
+           links_succeeded + links_failed);
+  a_ctx = GNUNET_new_array (num_peers,
+                            struct Context);
  /* select the peers which actively participate in profiling */
-  n_active = num_peers * PUT_PROBABILITY / 100;
+  n_active = num_peers * put_probability / 100;
  if (0 == n_active)
  {
    GNUNET_SCHEDULER_shutdown ();
    GNUNET_free (a_ctx);
+    a_ctx = NULL;
    return;
  }
-  a_ac = GNUNET_malloc (n_active * sizeof (struct ActiveContext));
+  a_ac = GNUNET_new_array (n_active,
+                           struct ActiveContext);
  ac_cnt = 0;
-  for (cnt = 0; cnt < num_peers && ac_cnt < n_active; cnt++)
+  for (unsigned int cnt = 0; cnt < num_peers && ac_cnt < n_active; cnt++)
  {
-    if ((GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100) >=
+    if (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
-        PUT_PROBABILITY))
+                                  100) >= put_probability)
      continue;
    a_ctx[cnt].ac = &a_ac[ac_cnt];
@@ -1125,10 +877,9 @@ test_run (void *cls,
    ac_cnt++;
  }
  n_active = ac_cnt;
-  INFO ("Active peers: %u\n", n_active);
  /* start DHT service on all peers */
-  for (cnt = 0; cnt < num_peers; cnt++)
+  for (unsigned int cnt = 0; cnt < num_peers; cnt++)
  {
    a_ctx[cnt].peer = peers[cnt];
    a_ctx[cnt].op = GNUNET_TESTBED_peer_manage_service (&a_ctx[cnt],
@@ -1150,7 +901,9 @@ test_run (void *cls,
 * @param config configuration
 */
 static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
     const struct GNUNET_CONFIGURATION_Handle *config)
 {
  uint64_t event_mask;
@@ -1162,10 +915,16 @@ run (void *cls, char *const *args, const char *cfgfile,
                num_peers);
    return;
  }
-  cfg = GNUNET_CONFIGURATION_dup (config);
+  cfg = config;
  event_mask = 0;
-  GNUNET_TESTBED_run (hosts_file, cfg, num_peers, event_mask, NULL,
+  GNUNET_TESTBED_run (hosts_file,
-                      NULL, &test_run, NULL);
+                      cfg,
+                      num_peers,
+                      event_mask,
+                      NULL,
+                      NULL,
+                      &test_run,
+                      NULL);
  GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
                                 NULL);
 }
@@ -1177,63 +936,62 @@ run (void *cls, char *const *args, const char *cfgfile,
 * @return 0 on success
 */
 int
-main (int argc, char *const *argv)
+main (int argc,
+      char *const *argv)
 {
  int rc;
  struct GNUNET_GETOPT_CommandLineOption options[] = {
    GNUNET_GETOPT_option_uint ('n',
-                                   "peers",
+                               "peers",
-                                   "COUNT",
+                               "COUNT",
-                                   gettext_noop ("number of peers to start"),
+                               gettext_noop ("number of peers to start"),
-                                   &num_peers),
+                               &num_peers),
+    GNUNET_GETOPT_option_uint ('p',
-    GNUNET_GETOPT_option_uint ('s',
+                               "peer-put-count",
-                                   "searches",
+                               "COUNT",
-                                   "COUNT",
+                               gettext_noop ("number of PUTs to perform per peer"),
-                                   gettext_noop ("maximum number of times we try to search for successor circle formation (0 for R5N)"),
+                               &num_puts_per_peer),
-                                   &max_searches),
    GNUNET_GETOPT_option_string ('H',
                                 "hosts",
                                 "FILENAME",
                                 gettext_noop ("name of the file with the login information for the testbed"),
                                 &hosts_file),
    GNUNET_GETOPT_option_relative_time ('D',
-                                            "delay",
+                                        "delay",
-                                            "DELAY",
+                                        "DELAY",
-                                            gettext_noop ("delay between rounds for collecting statistics (default: 30 sec)"),
+                                        gettext_noop ("delay between rounds for collecting statistics (default: 30 sec)"),
-                                            &delay_stats),
+                                        &delay_stats),
    GNUNET_GETOPT_option_relative_time ('P',
-                                            "PUT-delay",
+                                        "PUT-delay",
-                                            "DELAY",
+                                        "DELAY",
-                                            gettext_noop ("delay to start doing PUTs (default: 1 sec)"),
+                                        gettext_noop ("delay to start doing PUTs (default: 1 sec)"),
-                                            &delay_put),
+                                        &delay_put),
    GNUNET_GETOPT_option_relative_time ('G',
-                                            "GET-delay",
+                                        "GET-delay",
-                                            "DELAY",
+                                        "DELAY",
-                                            gettext_noop ("delay to start doing GETs (default: 5 min)"),
+                                        gettext_noop ("delay to start doing GETs (default: 5 min)"),
-                                            &delay_get),
+                                        &delay_get),
    GNUNET_GETOPT_option_uint ('r',
-                                   "replication",
+                               "replication",
-                                   "DEGREE",
+                               "DEGREE",
-                                   gettext_noop ("replication degree for DHT PUTs"),
+                               gettext_noop ("replication degree for DHT PUTs"),
-                                   &replication),
+                               &replication),
+    GNUNET_GETOPT_option_uint ('R',
+                               "random-chance",
+                               "PROBABILITY",
+                               gettext_noop ("chance that a peer is selected at random for PUTs"),
+                               &put_probability),
    GNUNET_GETOPT_option_relative_time ('t',
-                                            "timeout",
+                                        "timeout",
-                                            "TIMEOUT",
+                                        "TIMEOUT",
-                                            gettext_noop ("timeout for DHT PUT and GET requests (default: 1 min)"),
+                                        gettext_noop ("timeout for DHT PUT and GET requests (default: 1 min)"),
-                                            &timeout),
+                                        &timeout),
    GNUNET_GETOPT_OPTION_END
  };
-  max_searches = 5;
+  if (GNUNET_OK !=
-  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+      GNUNET_STRINGS_get_utf8_args (argc, argv,
+                                    &argc, &argv))
    return 2;
  /* set default delays */
  delay_stats = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10);
@@ -1243,10 +1001,13 @@ main (int argc, char *const *argv)
  replication = 1;      /* default replication */
  rc = 0;
  if (GNUNET_OK !=
-      GNUNET_PROGRAM_run (argc, argv, "dht-profiler",
+      GNUNET_PROGRAM_run (argc,
-                          gettext_noop
+                          argv,
-                          ("Measure quality and performance of the DHT service."),
+                          "gnunet-dht-profiler",
-                          options, &run, NULL))
+                          gettext_noop ("Measure quality and performance of the DHT service."),
+                          options,
+                          &run,
+                          NULL))
    rc = 1;
  return rc;
 }
diff --git a/src/dht/plugin_block_dht.c b/src/dht/plugin_block_dht.c
index 24f8b21b2..d4b19677e 100644
--- a/src/dht/plugin_block_dht.c
+++ b/src/dht/plugin_block_dht.c
@@ -2,20 +2,18 @@
     This file is part of GNUnet
     Copyright (C) 2010, 2017 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
@@ -66,7 +64,8 @@ block_plugin_dht_create_group (void *cls,
  guard = va_arg (va, const char *);
  if (0 == strcmp (guard,
                   "seen-set-size"))
-    bf_size = GNUNET_BLOCK_GROUP_compute_bloomfilter_size (va_arg (va, unsigned int),
+    bf_size = GNUNET_BLOCK_GROUP_compute_bloomfilter_size (va_arg (va,
+                                                                   unsigned int),
                                                           BLOOMFILTER_K);
  else if (0 == strcmp (guard,
                        "filter-size"))
@@ -183,14 +182,17 @@ block_plugin_dht_get_key (void *cls,
    return GNUNET_SYSERR;
  if (block_size < sizeof (struct GNUNET_MessageHeader))
  {
-    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "block-dht",
+    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
-                     _("Block not of type %u\n"), GNUNET_BLOCK_TYPE_DHT_HELLO);
+                     "block-dht",
+                     _("Block not of type %u\n"),
+                     GNUNET_BLOCK_TYPE_DHT_HELLO);
    return GNUNET_NO;
  }
  msg = block;
  if (block_size != ntohs (msg->size))
  {
-    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "block-dht",
+    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+                     "block-dht",
                     _("Size mismatch for block\n"),
                     GNUNET_BLOCK_TYPE_DHT_HELLO);
    return GNUNET_NO;
@@ -200,7 +202,8 @@ block_plugin_dht_get_key (void *cls,
  pid = (struct GNUNET_PeerIdentity *) key;
  if (GNUNET_OK != GNUNET_HELLO_get_id (hello, pid))
  {
-    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "block-dht",
+    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+                     "block-dht",
                     _("Block of type %u is malformed\n"),
                     GNUNET_BLOCK_TYPE_DHT_HELLO);
    return GNUNET_NO;
diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf
index c3fe5135f..0e546cf68 100644
--- a/src/dht/test_dht_2dtorus.conf
+++ b/src/dht/test_dht_2dtorus.conf
@@ -1,11 +1,11 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
-@INLINE@ ../../contrib/no_autostart_above_core.conf
+@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test_dht_2dtorus/
+GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_2dtorus/
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 [dhtcache]
 QUOTA = 1 MB
@@ -28,7 +28,7 @@ WAN_QUOTA_OUT = 1 GB
 OVERLAY_TOPOLOGY = 2D_TORUS
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKDELAY = 500 ms
 INTERVAL = 60 s
 WORKBITS = 0
diff --git a/src/dht/test_dht_api.c b/src/dht/test_dht_api.c
index 62d121306..9097a0011 100644
--- a/src/dht/test_dht_api.c
+++ b/src/dht/test_dht_api.c
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2009, 2015, 2017 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
 * @file dht/test_dht_api.c
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index de9196107..cb875fad4 100644
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -1,8 +1,8 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
-@INLINE@ ../../contrib/no_autostart_above_core.conf
+@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-dht-api/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-dht-api/
 [dhtcache]
 QUOTA = 1 MB
@@ -36,9 +36,9 @@ INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKBITS = 1
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index 0b9db1f8b..230aa0fa4 100644
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -1,5 +1,5 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
-@INLINE@ ../../contrib/no_autostart_above_core.conf
+@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
 [dhtcache]
 QUOTA = 1 MB
@@ -21,7 +21,7 @@ TIMEOUT = 300 s
 BINDTO = 127.0.0.1
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-dht-peer-1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-dht-peer-1/
 [nat]
 DISABLEV6 = YES
@@ -33,9 +33,9 @@ EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = NO
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKBITS = 1
diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf
index de91ed32b..62e337ef2 100644
--- a/src/dht/test_dht_line.conf
+++ b/src/dht/test_dht_line.conf
@@ -1,11 +1,11 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
-@INLINE@ ../../contrib/no_autostart_above_core.conf
+@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test_dht_line/
+GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_line/
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 [dhtcache]
 QUOTA = 1 MB
@@ -32,7 +32,7 @@ OVERLAY_TOPOLOGY = LINE
 plugins = unix
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKDELAY = 500 ms
 INTERVAL = 60 s
 WORKBITS = 0
diff --git a/src/dht/test_dht_monitor.c b/src/dht/test_dht_monitor.c
index 3de800144..33467e89c 100644
--- a/src/dht/test_dht_monitor.c
+++ b/src/dht/test_dht_monitor.c
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2011, 2012 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
 * @file dht/test_dht_monitor.c
diff --git a/src/dht/test_dht_monitor.conf b/src/dht/test_dht_monitor.conf
index ed0dece58..feefc2f5e 100644
--- a/src/dht/test_dht_monitor.conf
+++ b/src/dht/test_dht_monitor.conf
@@ -1,5 +1,5 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
-@INLINE@ ../../contrib/no_autostart_above_core.conf
+@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
 [dhtcache]
@@ -17,7 +17,7 @@ WAN_QUOTA_OUT = 1 GB
 OVERLAY_TOPOLOGY = LINE
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-dht-monitor/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-dht-monitor/
 [nat]
 DISABLEV6 = YES
@@ -31,9 +31,9 @@ RETURN_LOCAL_ADDRESSES = YES
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKBITS = 1
diff --git a/src/dht/test_dht_multipeer.conf b/src/dht/test_dht_multipeer.conf
index 1d69dacfd..ac35664c4 100644
--- a/src/dht/test_dht_multipeer.conf
+++ b/src/dht/test_dht_multipeer.conf
@@ -1,9 +1,9 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
-@INLINE@ ../../contrib/no_autostart_above_core.conf
+@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 [dhtcache]
 QUOTA = 1 MB
@@ -21,7 +21,7 @@ OVERLAY_TOPOLOGY = FROM_FILE
 OVERLAY_TOPOLOGY_FILE = test_dht_multipeer_topology.dat
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-dht-multipeer/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-dht-multipeer/
 [nat]
 DISABLEV6 = YES
@@ -34,7 +34,7 @@ EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = YES
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKDELAY = 500 ms
 INTERVAL = 60 s
 WORKBITS = 0
diff --git a/src/dht/test_dht_tools.conf b/src/dht/test_dht_tools.conf
index 9306c5dc9..05f7cc0e6 100644
--- a/src/dht/test_dht_tools.conf
+++ b/src/dht/test_dht_tools.conf
@@ -18,7 +18,7 @@ TIMEOUT = 300 s
 BINDTO = 127.0.0.1
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunet-dht-peer-1/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-dht-peer-1/
 [nat]
 DISABLEV6 = YES
@@ -30,128 +30,128 @@ EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = NO
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKBITS = 1
 # Configuration to disable autostarting of
 # all services above the 'core' level.
 # (including resolver)
 [dns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [cadet]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [datastore]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [fs]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [dv]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [vpn]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [consensus]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [resolver]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [namestore]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [namecache]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [identity]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [revocation]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [conversation]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [peerstore]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [psycstore]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [gns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [regex]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [set]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [scalarproduct-bob]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [scalarproduct-alice]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [social]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [psyc]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [rps]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [multicast]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [sensordashboard]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [sensor]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 # Configuration file that can be included to prevent ANY of the usual
-# FORCESTART = YES to be set.  Also disables NSE POW calculation.
+# IMMEDIATE_START = YES to be set.  Also disables NSE POW calculation.
 #
 # This configuration is included from various configuration test files.
-# Whenever a new service is added that has FORCESTART = YES for
+# Whenever a new service is added that has IMMEDIATE_START = YES for
 # production should be disabled for (most) test suites, the option should
 # be added here instead of all over the place ;-).
 [core]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [fs]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [dht]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [cadet]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [nse]
-FORCESTART = NO
+IMMEDIATE_START = NO
 WORKBITS = 0
 [revocation]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [topology]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [hostlist]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [gns]
-FORCESTART = NO
+IMMEDIATE_START = NO
 [zonemaster]
-FORCESTART = NO
-\ No newline at end of file
+IMMEDIATE_START = NO
diff --git a/src/dht/test_dht_tools.py.in b/src/dht/test_dht_tools.py.in
index 2d4ab9adc..05582cbd0 100644
--- a/src/dht/test_dht_tools.py.in
+++ b/src/dht/test_dht_tools.py.in
@@ -21,105 +21,113 @@ import subprocess
 import time
 import tempfile
-os.environ["PATH"] = "@bindir@" + ":" + os.environ["PATH"];
+os.environ["PATH"] = "@bindir@" + ":" + os.environ["PATH"]
 if os.name == "nt":
-  tmp = os.getenv ("TEMP")
+    tmp = os.getenv("TEMP")
 else:
-  tmp = "/tmp"
+    tmp = "/tmp"
 if os.name == 'nt':
-  get = './gnunet-dht-get.exe'
+    get = './gnunet-dht-get.exe'
-  put = './gnunet-dht-put.exe'
+    put = './gnunet-dht-put.exe'
-  arm = 'gnunet-arm.exe'
+    arm = 'gnunet-arm.exe'
 else:
-  get = './gnunet-dht-get'
+    get = './gnunet-dht-get'
-  put = './gnunet-dht-put'
+    put = './gnunet-dht-put'
-  arm = 'gnunet-arm'
+    arm = 'gnunet-arm'
 cfgfile = 'test_dht_api_peer1.conf'
-  
 run_get = [get, '-c', cfgfile]
 run_put = [put, '-c', cfgfile]
 run_arm = [arm, '-c', cfgfile]
-debug = os.getenv ('DEBUG')
+debug = os.getenv('DEBUG')
 if debug:
-  run_arm += [debug.split (' ')]
+    run_arm += [debug.split(' ')]
-def cleanup (exitcode):
-  sys.exit (exitcode)
+def cleanup(exitcode):
+    sys.exit(exitcode)
-def sub_run (args, want_stdo = True, want_stde = False, nofail = False):
-  if want_stdo:
-    stdo = subprocess.PIPE
+def sub_run(args, want_stdo=True, want_stde=False, nofail=False):
-  else:
+    if want_stdo:
-    stdo = None
+        stdo = subprocess.PIPE
-  if want_stde:
+    else:
-    stde = subprocess.PIPE
+        stdo = None
-  else:
+    if want_stde:
-    stde = None
+        stde = subprocess.PIPE
-  p = subprocess.Popen (args, stdout = stdo, stderr = stde)
+    else:
-  stdo, stde = p.communicate ()
+        stde = None
-  if not nofail:
+    p = subprocess.Popen(args, stdout=stdo, stderr=stde)
-    if p.returncode != 0:
+    stdo, stde = p.communicate()
-      sys.exit (p.returncode)
+    if not nofail:
-  return (p.returncode, stdo, stde)
+        if p.returncode != 0:
+            sys.exit(p.returncode)
-def fail (result):
+    return (p.returncode, stdo, stde)
-  print (result)
-  r_arm (['-e'], want_stdo = False)
-  cleanup (1)
+def fail(result):
+    print(result)
-def r_something (to_run, extra_args, failer = None, normal = True, **kw):
+    r_arm(['-e'], want_stdo=False)
-  rc, stdo, stde = sub_run (to_run + extra_args, nofail = True, **kw)
+    cleanup(1)
-  if failer is not None:
-    failer (to_run + extra_args, rc, stdo, stde, normal)
-  return (rc, stdo, stde)
+def r_something(to_run, extra_args, failer=None, normal=True, **kw):
+    rc, stdo, stde = sub_run(to_run + extra_args, nofail=True, **kw)
-def r_arm (extra_args, **kw):
+    if failer is not None:
-  return r_something (run_arm, extra_args, **kw)
+        failer(to_run + extra_args, rc, stdo, stde, normal)
+    return (rc, stdo, stde)
-def r_get (extra_args, **kw):
-  return r_something (run_get, extra_args, **kw)
+def r_arm(extra_args, **kw):
-def r_put (extra_args, **kw):
+    return r_something(run_arm, extra_args, **kw)
-  return r_something (run_put, extra_args, **kw)
-def end_arm_failer (command, rc, stdo, stde, normal):
+def r_get(extra_args, **kw):
-  if normal:
+    return r_something(run_get, extra_args, **kw)
-    if rc != 0:
-      fail ("FAIL: error running {}\nCommand output was:\n{}\n{}".format (command, stdo, stde))
-  else:
+def r_put(extra_args, **kw):
-    if rc == 0:
+    return r_something(run_put, extra_args, **kw)
-      fail ("FAIL: expected error while running {}\nCommand output was:\n{}\n{}".format (command, stdo, stde))
-def print_only_failer (command, rc, stdo, stde, normal):
+def end_arm_failer(command, rc, stdo, stde, normal):
-  if normal:
+    if normal:
-    if rc != 0:
+        if rc != 0:
-      print ("FAIL: error running {}\nCommand output was:\n{}\n{}".format (command, stdo, stde))
+            fail("FAIL: error running {}\nCommand output was:\n{}\n{}".format(command, stdo, stde))
-      cleanup (1)
+    else:
-  else:
+        if rc == 0:
-    if rc == 0:
+            fail("FAIL: expected error while running {}\nCommand output was:\n{}\n{}".format(command, stdo, stde))
-      print ("FAIL: expected error while running {}\nCommand output was:\n{}\n{}".format (command, stdo, stde))
-      cleanup (1)
+def print_only_failer(command, rc, stdo, stde, normal):
+    if normal:
-print ("TEST: Starting ARM...", end='')
+        if rc != 0:
-r_arm (['-s'], failer = end_arm_failer, want_stdo = False, want_stde = False)
+            print("FAIL: error running {}\nCommand output was:\n{}\n{}".format(command, stdo, stde))
-print ("PASS")
+            cleanup(1)
-time.sleep (1)
+    else:
+        if rc == 0:
-print ("TEST: Testing put...", end='')
+            print("FAIL: expected error while running {}\nCommand output was:\n{}\n{}".format(command, stdo, stde))
-r_put (['-k', 'testkey', '-d', 'testdata', '-t', '8'], failer = end_arm_failer)
+            cleanup(1)
-print ("PASS")
-time.sleep (1)
+print("TEST: Starting ARM...", end='')
-print ("TEST: Testing get...", end='')
+r_arm(['-s'], failer=end_arm_failer, want_stdo=False, want_stde=False)
-rc, stdo, stde = r_get (['-k', 'testkey', '-T', '50 ms', '-t', '8'], want_stdo = True, failer = end_arm_failer)
+print("PASS")
-stdo = stdo.replace ('\r', '').splitlines ()
+time.sleep(1)
+print("TEST: Testing put...", end='')
+r_put(['-k', 'testkey', '-d', 'testdata', '-t', '8'], failer=end_arm_failer)
+print("PASS")
+time.sleep(1)
+print("TEST: Testing get...", end='')
+rc, stdo, stde = r_get(['-k', 'testkey', '-T', '50 ms', '-t', '8'], want_stdo=True, failer=end_arm_failer)
+stdo = stdo.replace('\r', '').splitlines()
 expect = "Result 0, type 8:\ntestdata".splitlines()
-if len (stdo) != 2 or len (expect) != 2 or stdo[0] != expect[0] or stdo[1] != expect[1]:
+if len(stdo) != 2 or len(expect) != 2 or stdo[0] != expect[0] or stdo[1] != expect[1]:
-  fail ("output `{}' differs from expected `{}'".format (stdo, expect))
+    fail("output `{}' differs from expected `{}'".format(stdo, expect))
-print ("PASS")
+print("PASS")
-r_arm (['-e', '-d'], failer = print_only_failer)
+r_arm(['-e', '-d'], failer=print_only_failer)
diff --git a/src/dht/test_dht_topo.c b/src/dht/test_dht_topo.c
index 79edb2b0c..e09a3be67 100644
--- a/src/dht/test_dht_topo.c
+++ b/src/dht/test_dht_topo.c
@@ -2,20 +2,18 @@
     This file is part of GNUnet.
     Copyright (C) 2012, 2016 GNUnet e.V.
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software: you can redistribute it and/or modify it
-     it under the terms of the GNU General Public License as published
+     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
+     by the Free Software Foundation, either version 3 of the License,
-     option) any later version.
+     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.
+     Affero General Public License for more details.
+    
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU Affero General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
 */
 /**
 * @file dht/test_dht_topo.c