5 files changed, 260 insertions, 184 deletions

diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index 5db9868ab..cc4531ad2 100644
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -108,30 +108,6 @@ gnunet_service_mesh_new_LDFLAGS = -lrt
 endif
 
 
-noinst_PROGRAMS = \
-  gnunet-regex-profiler \
-  gnunet-daemon-regexprofiler
-
-gnunet_regex_profiler_SOURCES = \
-  gnunet-regex-profiler.c
-gnunet_regex_profiler_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/mesh/libgnunetmesh.la \
-  $(top_builddir)/src/regex/libgnunetregex.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la
-gnunet_regex_profiler_DEPENDENCIES = \
-   libgnunetmesh.la
-
-gnunet_daemon_regexprofiler_SOURCES = \
-  gnunet-daemon-regexprofiler.c
-gnunet_daemon_regexprofiler_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/mesh/libgnunetmesh.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la
-gnunet_daemon_regexprofiler_DEPENDENCIES = \
-  libgnunetmesh.la
-
 noinst_LIBRARIES = libgnunetmeshtest.a
 
 libgnunetmeshtest_a_SOURCES = \
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c
index f5d323a35..2ee5b9d3f 100644
--- a/src/mesh/gnunet-service-mesh.c
+++ b/src/mesh/gnunet-service-mesh.c
@@ -8243,13 +8243,6 @@ key_generation_cb (void *cls,
               "Mesh for peer [%s] starting\n",
               GNUNET_i2s(&my_full_id));
 
-//   transport_handle = GNUNET_TRANSPORT_connect(c,
-//                                               &my_full_id,
-//                                               NULL,
-//                                               NULL,
-//                                               NULL,
-//                                               NULL);
-
   core_handle = GNUNET_CORE_connect (c, /* Main configuration */
                                      NULL,      /* Closure passed to MESH functions */
                                      &core_init,        /* Call core_init once connected */
diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index 26f25258e..3fb4e2522 100644
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -80,7 +80,9 @@ libgnunetregextest_la_DEPENDENCIES = \
 
 
 noinst_PROGRAMS = $(noinst_mysql_progs) \
-  perf-regex
+  perf-regex \
+  gnunet-regex-profiler \
+  gnunet-daemon-regexprofiler
 
 perf_regex_SOURCES = \
   perf-regex.c
@@ -92,6 +94,28 @@ perf_regex_DEPENDENCIES = \
   libgnunetregex.la \
   libgnunetregextest.la
 
+gnunet_regex_profiler_SOURCES = \
+  gnunet-regex-profiler.c
+gnunet_regex_profiler_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/regex/libgnunetregex.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
+gnunet_regex_profiler_DEPENDENCIES = \
+   libgnunetregex.la
+
+gnunet_daemon_regexprofiler_SOURCES = \
+  gnunet-daemon-regexprofiler.c
+gnunet_daemon_regexprofiler_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/dht/libgnunetdht.la \
+  $(top_builddir)/src/regex/libgnunetregex.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
+gnunet_daemon_regexprofiler_DEPENDENCIES = \
+  $(top_builddir)/src/dht/libgnunetdht.la \
+  libgnunetregex.la
+
+
 
 check_PROGRAMS = \
   test_regex_eval_api \
diff --git a/src/mesh/gnunet-daemon-regexprofiler.c b/src/regex/gnunet-daemon-regexprofiler.c
index 84e18b898..75d3f9c7e 100644
--- a/src/mesh/gnunet-daemon-regexprofiler.c
+++ b/src/regex/gnunet-daemon-regexprofiler.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2010, 2011, 2012 Christian Grothoff
+     (C) 2012,2013 Christian Grothoff
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -25,9 +25,12 @@
  * without the need to explicitly connect to the mesh service running on the
  * peer from within the profiler.
  * @author Maximilian Szengel
+ * @author Bartlomiej Polot
  */
 #include "platform.h"
-#include "gnunet_mesh_service.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_regex_lib.h"
+#include "gnunet_dht_service.h"
 #include "gnunet_statistics_service.h"
 
 /**
@@ -46,14 +49,34 @@ static const struct GNUNET_CONFIGURATION_Handle *cfg;
 static struct GNUNET_STATISTICS_Handle *stats_handle;
 
 /**
- * Peer's mesh handle.
+ * Peer's dht handle.
  */
-struct GNUNET_MESH_Handle *mesh_handle;
+static struct GNUNET_DHT_Handle *dht_handle;
 
 /**
- * Peer's mesh tunnel handle.
+ * Peer's regex announce handle.
  */
-struct GNUNET_MESH_Tunnel *mesh_tunnel_handle;
+static struct GNUNET_REGEX_announce_handle *announce_handle;
+
+/**
+ * Hostkey generation context
+ */
+static struct GNUNET_CRYPTO_RsaKeyGenerationContext *keygen;
+
+/**
+ * Periodically reannounce regex.
+ */
+static GNUNET_SCHEDULER_TaskIdentifier reannounce_task;
+
+/**
+ * How often reannounce regex.
+ */
+static struct GNUNET_TIME_Relative reannounce_freq;
+
+/**
+ * Local peer's PeerID.
+ */
+static struct GNUNET_PeerIdentity my_full_id;
 
 /**
  * Maximal path compression length for regex announcing.
@@ -72,6 +95,12 @@ static char * policy_filename;
 static char * regex_prefix;
 
 /**
+ * Regex with prefix.
+ */
+static char *rx_with_pfx;
+
+
+/**
  * Task run during shutdown.
  *
  * @param cls unused
@@ -82,16 +111,21 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "shutting down\n");
 
-  if (NULL != mesh_tunnel_handle)
+  if (NULL != keygen)
   {
-    GNUNET_MESH_tunnel_destroy (mesh_tunnel_handle);
-    mesh_tunnel_handle = NULL;
+    GNUNET_CRYPTO_rsa_key_create_stop (keygen);
+    keygen = NULL;
+  }
+  if (NULL != announce_handle)
+  {
+    GNUNET_REGEX_announce_cancel (announce_handle);
+    announce_handle = NULL;
   }
 
-  if (NULL != mesh_handle)
+  if (NULL != dht_handle)
   {
-    GNUNET_MESH_disconnect (mesh_handle);
-    mesh_handle = NULL;
+    GNUNET_DHT_disconnect (dht_handle);
+    dht_handle = NULL;
   }
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "shut down\n");
@@ -99,6 +133,24 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 /**
+ * Announce a previously announced regex re-using cached data.
+ * 
+ * @param cls Clocuse (not used).
+ * @param tc TaskContext.
+ */
+static void
+reannounce_regex (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  reannounce_task = GNUNET_SCHEDULER_NO_TASK;
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+    return;
+  reannounce_task = GNUNET_SCHEDULER_add_delayed(reannounce_freq,
+                                                 &reannounce_regex,
+                                                 cls);
+}
+
+
+/**
  * Announce the given regular expression using Mesh and the path compression
  * length read from config.
  *
@@ -115,7 +167,15 @@ announce_regex (const char * regex)
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Announcing regex: %s\n", regex);
   GNUNET_STATISTICS_update (stats_handle, "# regexes announced", 1, GNUNET_NO);
-  GNUNET_MESH_announce_regex (mesh_handle, regex, (unsigned int)max_path_compression);
+  announce_handle = GNUNET_REGEX_announce (dht_handle,
+                                           NULL,
+                                           regex,
+                                           (unsigned int) max_path_compression,
+                                           stats_handle);
+  GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == reannounce_task);
+  reannounce_task = GNUNET_SCHEDULER_add_delayed (reannounce_freq,
+                                                  reannounce_regex,
+                                                  NULL);
 }
 
 
@@ -124,7 +184,9 @@ announce_regex (const char * regex)
  *
  * @param filename filename of the file containing the regexes, one per line.
  * @param rx string with the union of all regular expressions.
+ *
  * @return number of regular expressions read from filename and in rxes array.
+ * FIXME use load regex lib function
  */
 static unsigned int
 load_regexes (const char *filename, char **rx)
@@ -179,6 +241,42 @@ load_regexes (const char *filename, char **rx)
 
 
 /**
+ * Callback for hostkey read/generation
+ *
+ * @param cls Closure (not used).
+ * @param pk The private key of the local peer.
+ * @param emsg Error message if applicable.
+ */
+static void
+key_generation_cb (void *cls,
+                   struct GNUNET_CRYPTO_RsaPrivateKey *pk,
+                   const char *emsg)
+{
+  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded my_public_key;
+
+  keygen = NULL;
+  if (NULL == pk)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Regexprofiler could not access hostkey: %s. Exiting.\n"),
+                emsg);
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+
+  GNUNET_CRYPTO_rsa_key_get_public (pk, &my_public_key);
+  GNUNET_CRYPTO_hash (&my_public_key, sizeof (my_public_key),
+                      &my_full_id.hashPubKey);
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Regexprofiler for peer [%s] starting\n",
+              GNUNET_i2s(&my_full_id));
+  announce_regex (rx_with_pfx);
+  GNUNET_free (rx_with_pfx);
+}
+
+
+/**
  * @brief Main function that will be run by the scheduler.
  *
  * @param cls closure
@@ -192,15 +290,23 @@ run (void *cls, char *const *args GNUNET_UNUSED,
      const struct GNUNET_CONFIGURATION_Handle *cfg_)
 {
   char *regex = NULL;
-  char *rx_with_pfx;
-  const GNUNET_MESH_ApplicationType app = (GNUNET_MESH_ApplicationType)0;
-  static struct GNUNET_MESH_MessageHandler handlers[] = {
-    {NULL, 0, 0}
-  };
+  char *keyfile;
 
   cfg = cfg_;
 
   if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_filename (cfg, "GNUNETD", "HOSTKEY",
+                                               &keyfile))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _
+                ("%s service is lacking key configuration settings (%s).  Exiting.\n"),
+                "regexprofiler", "hostkey");
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+
+  if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_number (cfg, "REGEXPROFILER", "MAX_PATH_COMPRESSION",
                                              &max_path_compression))
   {
@@ -214,8 +320,8 @@ run (void *cls, char *const *args GNUNET_UNUSED,
   }
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_filename (cfg, "REGEXPROFILER", "POLICY_FILE",
-                                               &policy_filename))
+      GNUNET_CONFIGURATION_get_value_filename (cfg, "REGEXPROFILER",
+                                               "POLICY_FILE", &policy_filename))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _
@@ -227,8 +333,8 @@ run (void *cls, char *const *args GNUNET_UNUSED,
   }
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg, "REGEXPROFILER", "REGEX_PREFIX",
-                                             &regex_prefix))
+      GNUNET_CONFIGURATION_get_value_string (cfg, "REGEXPROFILER",
+                                             "REGEX_PREFIX", &regex_prefix))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _
@@ -239,14 +345,25 @@ run (void *cls, char *const *args GNUNET_UNUSED,
     return;
   }
 
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_time (cfg, "REGEXPROFILER",
+                                           "REANNOUNCE_FREQ", &reannounce_freq))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+                "reannounce_freq not given. Using 10 minutes.\n");
+    reannounce_freq =
+      GNUNET_TIME_relative_multiply(GNUNET_TIME_relative_get_minute_(), 10);
+
+  }
+
   stats_handle = GNUNET_STATISTICS_create ("regexprofiler", cfg);
 
-  mesh_handle =
-    GNUNET_MESH_connect (cfg, NULL, NULL, NULL, handlers, &app);
+  dht_handle = GNUNET_DHT_connect (cfg, 1);
 
-  if (NULL == mesh_handle)
+  if (NULL == dht_handle)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not acquire mesh handle. Exiting.\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not acquire dht handle. Exiting.\n");
     global_ret = GNUNET_SYSERR;
     GNUNET_SCHEDULER_shutdown ();
     return;
@@ -265,10 +382,13 @@ run (void *cls, char *const *args GNUNET_UNUSED,
 
   /* Announcing regexes from policy_filename */
   GNUNET_asprintf (&rx_with_pfx, "%s(%s)", regex_prefix, regex);
-  announce_regex (rx_with_pfx);
-  GNUNET_free (rx_with_pfx);
   GNUNET_free (regex);
 
+  keygen = GNUNET_CRYPTO_rsa_key_create_start (keyfile,
+                                               &key_generation_cb,
+                                               NULL);
+  GNUNET_free (keyfile);
+
   /* Scheduled the task to clean up when shutdown is called */
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
                                 NULL);
diff --git a/src/mesh/gnunet-regex-profiler.c b/src/regex/gnunet-regex-profiler.c
index f431d6484..d8990a626 100644
--- a/src/mesh/gnunet-regex-profiler.c
+++ b/src/regex/gnunet-regex-profiler.c
@@ -31,8 +31,9 @@
 #include "platform.h"
 #include "gnunet_applications.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_mesh_service.h"
-#include "gnunet_stream_lib.h"
+#include "gnunet_regex_lib.h"
+#include "gnunet_dht_service.h"
+// #include "gnunet_stream_lib.h"
 #include "gnunet_testbed_service.h"
 
 /**
@@ -149,19 +150,19 @@ struct RegexPeer
   int search_str_matched;
 
   /**
-   * Peer's mesh handle.
+   * Peer's dht handle.
    */
-  struct GNUNET_MESH_Handle *mesh_handle;
+  struct GNUNET_DHT_Handle *dht_handle;
 
   /**
-   * Peer's mesh tunnel handle.
+   * Handle to a running regex search.
    */
-  struct GNUNET_MESH_Tunnel *mesh_tunnel_handle;
+   struct GNUNET_REGEX_search_handle *search_handle;
 
   /**
-   * Testbed operation handle for the mesh service.
+   * Testbed operation handle for the dht service.
    */
-  struct GNUNET_TESTBED_Operation *mesh_op_handle;
+  struct GNUNET_TESTBED_Operation *dht_op_handle;
 
   /**
    * Peers's statistics handle.
@@ -382,34 +383,25 @@ static char * regex_prefix;
 
 
 /**
- * Method called whenever a peer has connected to the tunnel.
- *
- * @param cls closure
- * @param peer_id peer identity the tunnel was created to, NULL on timeout
- * @param atsi performance data for the connection
+ * Search callback function.
  *
+ * @param cls Closure provided in GNUNET_REGEX_search.
+ * @param id Peer providing a regex that matches the string.
+ * @param get_path Path of the get request.
+ * @param get_path_length Lenght of get_path.
+ * @param put_path Path of the put request.
+ * @param put_path_length Length of the put_path.
  */
 static void
 mesh_peer_connect_handler (void *cls,
-                           const struct GNUNET_PeerIdentity* peer_id,
-                           const struct GNUNET_ATS_Information * atsi);
+                           const struct GNUNET_PeerIdentity *id,
+                           const struct GNUNET_PeerIdentity *get_path,
+                           unsigned int get_path_length,
+                           const struct GNUNET_PeerIdentity *put_path,
+                           unsigned int put_path_length);
 
 
 /**
- * Method called whenever a peer has disconnected from the tunnel.
- * Implementations of this callback must NOT call
- * GNUNET_MESH_tunnel_destroy immediately, but instead schedule those
- * to run in some other task later.  However, calling
- * "GNUNET_MESH_notify_transmit_ready_cancel" is allowed.
- *
- * @param cls closure
- * @param peer_id peer identity the tunnel stopped working with
- */
-static void
-mesh_peer_disconnect_handler (void *cls,
-                              const struct GNUNET_PeerIdentity * peer_id);
-
-/**
  * Mesh connect callback.
  *
  * @param cls internal peer id.
@@ -418,11 +410,11 @@ mesh_peer_disconnect_handler (void *cls,
  * @param emsg error message.
  */
 static void
-mesh_connect_cb (void *cls, struct GNUNET_TESTBED_Operation *op,
+dht_connect_cb (void *cls, struct GNUNET_TESTBED_Operation *op,
                  void *ca_result, const char *emsg);
 
 /**
- * Mesh connect adapter.
+ * DHT connect adapter.
  *
  * @param cls not used.
  * @param cfg configuration handle.
@@ -430,18 +422,18 @@ mesh_connect_cb (void *cls, struct GNUNET_TESTBED_Operation *op,
  * @return
  */
 static void *
-mesh_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg);
+dht_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
  * Adapter function called to destroy a connection to
- * the mesh service
+ * the DHT service
  *
  * @param cls closure
  * @param op_result service handle returned from the connect adapter
  */
 static void
-mesh_da (void *cls, void *op_result);
+dht_da (void *cls, void *op_result);
 
 
 /**
@@ -532,8 +524,8 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
         GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Unable to write to file!\n");
     }
 
-    if (NULL != peers[peer_cnt].mesh_op_handle)
-      GNUNET_TESTBED_operation_done (peers[peer_cnt].mesh_op_handle);
+    if (NULL != peers[peer_cnt].dht_op_handle)
+      GNUNET_TESTBED_operation_done (peers[peer_cnt].dht_op_handle);
     if (NULL != peers[peer_cnt].stats_op_handle)
       GNUNET_TESTBED_operation_done (peers[peer_cnt].stats_op_handle);
   }
@@ -795,37 +787,23 @@ do_collect_stats (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 /******************************************************************************/
 
 /**
- * Method called whenever a peer has disconnected from the tunnel.
- * Implementations of this callback must NOT call
- * GNUNET_MESH_tunnel_destroy immediately, but instead schedule those
- * to run in some other task later.  However, calling
- * "GNUNET_MESH_notify_transmit_ready_cancel" is allowed.
- *
- * @param cls closure
- * @param peer_id peer identity the tunnel stopped working with
- */
-static void
-mesh_peer_disconnect_handler (void *cls,
-                              const struct GNUNET_PeerIdentity * peer_id)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Mesh peer disconnect handler.\n");
-}
-
-
-/**
- * Method called when the mesh connection succeeded (or timed out), which means
- * we've found a peer that announced a regex that matches our search string. Now
- * get the statistics.
- *
- * @param cls closure
- * @param peer_id peer identity the tunnel was created to, NULL on timeout
- * @param atsi performance data for the connection
+ * Method called when we've found a peer that announced a regex
+ * that matches our search string. Now get the statistics.
  *
+ * @param cls Closure provided in GNUNET_REGEX_search.
+ * @param id Peer providing a regex that matches the string.
+ * @param get_path Path of the get request.
+ * @param get_path_length Lenght of get_path.
+ * @param put_path Path of the put request.
+ * @param put_path_length Length of the put_path.
  */
 static void
 mesh_peer_connect_handler (void *cls,
-                           const struct GNUNET_PeerIdentity* peer_id,
-                           const struct GNUNET_ATS_Information * atsi)
+                           const struct GNUNET_PeerIdentity *id,
+                           const struct GNUNET_PeerIdentity *get_path,
+                           unsigned int get_path_length,
+                           const struct GNUNET_PeerIdentity *put_path,
+                           unsigned int put_path_length)
 {
   struct RegexPeer *peer = cls;
   char output_buffer[512];
@@ -841,7 +819,7 @@ mesh_peer_connect_handler (void *cls,
 
   peers_found++;
 
-  if (NULL == peer_id)
+  if (NULL == id)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "String matching timed out for string %s on peer %u (%i/%i)\n",
@@ -889,8 +867,8 @@ mesh_peer_connect_handler (void *cls,
     }
   }
 
-  GNUNET_TESTBED_operation_done (peer->mesh_op_handle);
-  peer->mesh_op_handle = NULL;
+  GNUNET_TESTBED_operation_done (peer->dht_op_handle);
+  peer->dht_op_handle = NULL;
 
   if (peers_found == num_search_strings)
   {
@@ -959,14 +937,14 @@ do_connect_by_string (void *cls,
 
     /* First connect to mesh service, then search for string. Next
        connect will be in mesh_connect_cb */
-    peers[0].mesh_op_handle =
+    peers[0].dht_op_handle =
       GNUNET_TESTBED_service_connect (NULL,
                                       peers[0].peer_handle,
-                                      "mesh",
-                                      &mesh_connect_cb,
+                                      "dht",
+                                      &dht_connect_cb,
                                       &peers[0],
-                                      &mesh_ca,
-                                      &mesh_da,
+                                      &dht_ca,
+                                      &dht_da,
                                       &peers[0]);
 
   search_timeout_task = GNUNET_SCHEDULER_add_delayed (search_timeout,
@@ -975,7 +953,7 @@ do_connect_by_string (void *cls,
 
 
 /**
- * Mesh connect callback. Called when we are connected to the mesh service for
+ * DHT connect callback. Called when we are connected to the dht service for
  * the peer in 'cls'. If successfull we connect to the stats service of this
  * peer and then try to match the search string of this peer.
  *
@@ -985,8 +963,8 @@ do_connect_by_string (void *cls,
  * @param emsg error message.
  */
 static void
-mesh_connect_cb (void *cls, struct GNUNET_TESTBED_Operation *op,
-                 void *ca_result, const char *emsg)
+dht_connect_cb (void *cls, struct GNUNET_TESTBED_Operation *op,
+                void *ca_result, const char *emsg)
 {
   struct RegexPeer *peer = (struct RegexPeer *) cls;
   static unsigned int peer_cnt;
@@ -994,26 +972,20 @@ mesh_connect_cb (void *cls, struct GNUNET_TESTBED_Operation *op,
 
   if (NULL != emsg || NULL == op || NULL == ca_result)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Mesh connect failed: %s\n", emsg);
-    GNUNET_assert (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "DHT connect failed: %s\n", emsg);
+    GNUNET_abort ();
   }
 
-  GNUNET_assert (NULL != peer->mesh_handle);
-  GNUNET_assert (peer->mesh_op_handle == op);
-  GNUNET_assert (peer->mesh_handle == ca_result);
-
-  peer->mesh_tunnel_handle = 
-    GNUNET_MESH_tunnel_create (peer->mesh_handle,
-                               NULL,
-                               &mesh_peer_connect_handler,
-                               &mesh_peer_disconnect_handler,
-                               peer);
-
-  peer->prof_start_time = GNUNET_TIME_absolute_get ();
+  GNUNET_assert (NULL != peer->dht_handle);
+  GNUNET_assert (peer->dht_op_handle == op);
+  GNUNET_assert (peer->dht_handle == ca_result);
 
   peer->search_str_matched = GNUNET_NO;
-  GNUNET_MESH_peer_request_connect_by_string (peer->mesh_tunnel_handle,
-                                              peer->search_str);
+  peer->search_handle = 
+    GNUNET_REGEX_search (peer->dht_handle, peer->search_str,
+                         &mesh_peer_connect_handler, NULL, 
+                         NULL);
+  peer->prof_start_time = GNUNET_TIME_absolute_get ();
 
   if (peer_cnt < (num_search_strings - 1))
   {
@@ -1024,75 +996,66 @@ mesh_connect_cb (void *cls, struct GNUNET_TESTBED_Operation *op,
 
     peers[next_p].search_str = search_strings[next_p];
     peers[next_p].search_str_matched = GNUNET_NO;
-    
+
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Searching for string \"%s\" on peer %d with file %s\n",
                 peers[next_p].search_str, next_p, peers[next_p].policy_file);
 
-    peers[next_p].mesh_op_handle =
+    peers[next_p].dht_op_handle =
       GNUNET_TESTBED_service_connect (NULL,
                                       peers[next_p].peer_handle,
-                                      "mesh",
-                                      &mesh_connect_cb,
+                                      "dht",
+                                      &dht_connect_cb,
                                       &peers[next_p],
-                                      &mesh_ca,
-                                      &mesh_da,
+                                      &dht_ca,
+                                      &dht_da,
                                       &peers[next_p]);
   }
 }
 
 
 /**
- * Mesh connect adapter. Opens a connection to the mesh service.
+ * DHT connect adapter. Opens a connection to the dht service.
  *
- * @param cls not used.
- * @param cfg configuration handle.
+ * @param cls Closure (peer).
+ * @param cfg Configuration handle.
  *
  * @return
  */
 static void *
-mesh_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
+dht_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  GNUNET_MESH_ApplicationType app;
   struct RegexPeer *peer = cls;
 
-  static struct GNUNET_MESH_MessageHandler handlers[] = {
-    {NULL, 0, 0}
-  };
-
-  app = (GNUNET_MESH_ApplicationType)0;
+  peer->dht_handle = GNUNET_DHT_connect (cfg, 32);
 
-  peer->mesh_handle =
-    GNUNET_MESH_connect (cfg, peer, NULL, NULL, handlers, &app);
-
-  return peer->mesh_handle;
+  return peer->dht_handle;
 }
 
 
 /**
- * Adapter function called to destroy a connection to
- * the mesh service
+ * Adapter function called to destroy a connection to the dht service.
  *
- * @param cls closure
- * @param op_result service handle returned from the connect adapter
+ * @param cls Closure (peer).
+ * @param op_result Service handle returned from the connect adapter.
  */
 static void
-mesh_da (void *cls, void *op_result)
+dht_da (void *cls, void *op_result)
 {
   struct RegexPeer *peer = (struct RegexPeer *) cls;
 
-  GNUNET_assert (peer->mesh_handle == op_result);
+  GNUNET_assert (peer->dht_handle == op_result);
 
-  if (NULL != peer->mesh_tunnel_handle)
+  if (NULL != peer->search_handle)
   {
-    GNUNET_MESH_tunnel_destroy (peer->mesh_tunnel_handle);
-    peer->mesh_tunnel_handle = NULL;
+    GNUNET_REGEX_search_cancel (peer->search_handle);
+    peer->search_handle = NULL;
   }
 
-  if (NULL != peer->mesh_handle)
+  if (NULL != peer->dht_handle)
   {
-    GNUNET_MESH_disconnect (peer->mesh_handle);
-    peer->mesh_handle = NULL;
+    GNUNET_DHT_disconnect (peer->dht_handle);
+    peer->dht_handle = NULL;
   }
 }
 
@@ -1370,8 +1333,8 @@ controller_event_cb (void *cls,
             peer->policy_file = NULL;
             /* Do not start peers on hosts[0] (master controller) */
             peer->host_handle = hosts[1 + (peer_cnt % (num_hosts -1))];
-            peer->mesh_handle = NULL;
-            peer->mesh_tunnel_handle = NULL;
+            peer->dht_handle = NULL;
+            peer->search_handle = NULL;
             peer->stats_handle = NULL;
             peer->stats_op_handle = NULL;
             peer->search_str = NULL;