WiP

5 files changed, 641 insertions, 15 deletions

diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index a79958832..1f43b66d4 100644
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -53,7 +53,8 @@ check_PROGRAMS = \
  test_mesh_path_api \
  test_mesh_local_1 \
  test_mesh_local_2 \
- test_mesh_small
+ test_mesh_small \
+ test_mesh_small_unicast
 
 test_mesh_api_SOURCES = \
  test_mesh_api.c
@@ -98,6 +99,15 @@ test_mesh_small_LDADD = \
 test_mesh_small_DEPENDENCIES = \
   libgnunetmeshnew.la
 
+test_mesh_small_unicast_SOURCES = \
+ test_mesh_small_unicast.c
+test_mesh_small_unicast_LDADD = \
+  $(top_builddir)/src/mesh/libgnunetmeshnew.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la
+test_mesh_small_unicast_DEPENDENCIES = \
+  libgnunetmeshnew.la
+
 if ENABLE_TEST_RUN
 if HAVE_EXPERIMENTAL
 TESTS = test_mesh_api test_mesh_path_api test_mesh_local_1 test_mesh_local_2
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c
index 670c2f973..0d3d0211b 100644
--- a/src/mesh/gnunet-service-mesh.c
+++ b/src/mesh/gnunet-service-mesh.c
@@ -60,7 +60,7 @@
 
 #define ID_ANNOUNCE_TIME        GNUNET_TIME_relative_multiply(\
                                     GNUNET_TIME_UNIT_SECONDS,\
-                                    5)
+                                    10)
 
 
 /******************************************************************************/
@@ -549,13 +549,15 @@ announce_id (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
    * - Set data expiration in function of X
    * - Adapt X to churn
    */
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: DHT_put for ID %s started.\n",
+              GNUNET_h2s_full (&my_full_id.hashPubKey));
   GNUNET_DHT_put (dht_handle,   /* DHT handle */
                   &my_full_id.hashPubKey,       /* Key to use */
                   10U,          /* Replication level */
                   GNUNET_DHT_RO_RECORD_ROUTE,   /* DHT options */
                   GNUNET_BLOCK_TYPE_TEST,       /* Block type */
-                  0,            /* Size of the data */
-                  NULL,         /* Data itself */
+                  sizeof(my_full_id),   /* Size of the data */
+                  &my_full_id,          /* Data itself */
                   GNUNET_TIME_absolute_get_forever (),  /* Data expiration */
                   GNUNET_TIME_UNIT_FOREVER_REL, /* Retry time */
 #if MESH_DEBUG
@@ -2090,13 +2092,16 @@ dht_get_id_handler (void *cls, struct GNUNET_TIME_Absolute exp,
   struct GNUNET_PeerIdentity pi;
   int i;
 
+  GNUNET_PEER_resolve (path_info->peer->id, &pi);
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+             "MESH: Got results from DHT for %s\n",
+             GNUNET_h2s_full(&pi.hashPubKey));
   if (NULL == get_path || NULL == put_path)
   {
     if (NULL == path_info->peer->path_head)
     {
       // Find ourselves some alternate initial path to the destination: retry
       GNUNET_DHT_get_stop (path_info->peer->dhtget);
-      GNUNET_PEER_resolve (path_info->peer->id, &pi);
       path_info->peer->dhtget = GNUNET_DHT_get_start (dht_handle,       /* handle */
                                                       GNUNET_TIME_UNIT_FOREVER_REL,     /* timeout */
                                                       GNUNET_BLOCK_TYPE_TEST,   /* type */
@@ -2565,7 +2570,7 @@ handle_local_connect_add (void *cls, struct GNUNET_SERVER_Client *client,
   MESH_TunnelNumber tid;
   struct MeshPeerInfo *peer_info;
 
-
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "MESH: Got connection request\n");
   /* Sanity check for client registration */
   if (NULL == (c = client_get (client)))
   {
@@ -2600,7 +2605,8 @@ handle_local_connect_add (void *cls, struct GNUNET_SERVER_Client *client,
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
-
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "MESH:      for %s\n",
+             GNUNET_h2s_full(&peer_msg->peer.hashPubKey));
   peer_info = peer_info_get (&peer_msg->peer);
 
   /* Start DHT search if needed, otherwise just add peer to tunnel. */
@@ -2995,17 +3001,23 @@ static void
 core_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
               const struct GNUNET_TRANSPORT_ATS_Information *atsi)
 {
-//     GNUNET_PEER_Id              pid;
   struct MeshPeerInfo *peer_info;
   struct MeshPeerPath *path;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Peer connected\n");
+//   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Peer connected\n");
+//   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH:      %s\n",
+//               GNUNET_h2s(&my_full_id.hashPubKey));
   peer_info = peer_info_get (peer);
   if (myid == peer_info->id)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH:      (self)\n");
+//     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH:      (self)\n");
     return;
   }
+  else
+  {
+//     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH:      %s\n",
+//                 GNUNET_h2s(&peer->hashPubKey));
+  }
   path = path_new (2);
   path->peers[0] = myid;
   path->peers[1] = peer_info->id;
diff --git a/src/mesh/small.dat b/src/mesh/small.dat
new file mode 100644
index 000000000..c3805ee80
--- /dev/null
+++ b/src/mesh/small.dat
@@ -0,0 +1,21 @@
+16
+1:2
+1:9
+2:3
+3:4
+3:11
+4:5
+5:6
+5:13
+6:7
+7:8
+7:15
+8:9
+9:10
+10:11
+11:12
+12:13
+13:14
+14:15
+15:16
+16:1
diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf
index 2a834f6bd..84e281bd1 100644
--- a/src/mesh/test_mesh_small.conf
+++ b/src/mesh/test_mesh_small.conf
@@ -12,7 +12,11 @@ AUTOSTART = YES
 PORT = 10000
 
 [dht]
-AUTOSTART = NO
+DEBUG = NO
+AUTOSTART = YES
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+HOSTNAME = localhost
 PORT = 10001
 
 [dns]
@@ -42,12 +46,14 @@ PORT = 10004
 
 [mesh]
 PORT = 10005
+DEBUG=YES
 
 [testing]
 NUM_PEERS = 16
 WEAKRANDOM = YES
-TOPOLOGY = NONE
-CONNECT_TOPOLOGY = RING
+TOPOLOGY = CLIQUE
+CONNECT_TOPOLOGY = NONE
+TOPOLOGY_FILE = small.dat
 #CONNECT_TOPOLOGY = ERDOS_RENYI
 #CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM
 #CONNECT_TOPOLOGY_OPTION_MODIFIER = 25
@@ -70,6 +76,6 @@ MAX_OUTSTANDING_CONNECTIONS = 75
 DELETE_FILES = YES
 
 [test_mesh_small]
-WAIT_TIME = 2
+WAIT_TIME = 60
 CONNECTION_LIMIT = 10
-DATA_OUTPUT_FILE=data_output
\ No newline at end of file
+DATA_OUTPUT_FILE=data_output
diff --git a/src/mesh/test_mesh_small_unicast.c b/src/mesh/test_mesh_small_unicast.c
new file mode 100644
index 000000000..4cd07c095
--- /dev/null
+++ b/src/mesh/test_mesh_small_unicast.c
@@ -0,0 +1,577 @@
+/*
+     This file is part of GNUnet.
+     (C) 2011 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+/**
+ * @file mesh/test_mesh_small_unicast.c
+ *
+ * @brief Test for the mesh service: retransmission of unicast traffic.
+ */
+#include "platform.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_mesh_service_new.h"
+
+#define VERBOSE GNUNET_YES
+#define REMOVE_DIR GNUNET_YES
+
+struct MeshPeer
+{
+  struct MeshPeer *prev;
+
+  struct MeshPeer *next;
+
+  struct GNUNET_TESTING_Daemon *daemon;
+
+  struct GNUNET_MESH_Handle *mesh_handle;
+};
+
+
+struct StatsContext
+{
+  unsigned long long total_mesh_bytes;
+};
+
+
+// static struct MeshPeer *peer_head;
+//
+// static struct MeshPeer *peer_tail;
+
+/**
+ * How long until we give up on connecting the peers?
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1500)
+
+static int ok;
+
+/**
+ * Be verbose
+ */
+static int verbose;
+
+/**
+ * Total number of peers in the test.
+ */
+static unsigned long long num_peers;
+
+/**
+ * Global configuration file
+ */
+static struct GNUNET_CONFIGURATION_Handle *testing_cfg;
+
+/**
+ * Total number of currently running peers.
+ */
+static unsigned long long peers_running;
+
+/**
+ * Total number of connections in the whole network.
+ */
+static unsigned int total_connections;
+
+/**
+ * The currently running peer group.
+ */
+static struct GNUNET_TESTING_PeerGroup *pg;
+
+/**
+ * File to report results to.
+ */
+static struct GNUNET_DISK_FileHandle *output_file;
+
+/**
+ * File to log connection info, statistics to.
+ */
+static struct GNUNET_DISK_FileHandle *data_file;
+
+/**
+ * How many data points to capture before triggering next round?
+ */
+static struct GNUNET_TIME_Relative wait_time;
+
+/**
+ * Task called to disconnect peers.
+ */
+static GNUNET_SCHEDULER_TaskIdentifier disconnect_task;
+
+/**
+ * Task To perform tests
+ */
+static GNUNET_SCHEDULER_TaskIdentifier test_task;
+
+/**
+ * Task called to shutdown test.
+ */
+static GNUNET_SCHEDULER_TaskIdentifier shutdown_handle;
+
+static char *topology_file;
+
+static char *data_filename;
+
+struct GNUNET_TESTING_Daemon *d1;
+
+struct GNUNET_TESTING_Daemon *d2;
+
+struct GNUNET_MESH_Handle *h1;
+
+struct GNUNET_MESH_Handle *h2;
+
+struct GNUNET_MESH_Tunnel *t;
+
+/**
+ * Check whether peers successfully shut down.
+ */
+static void
+shutdown_callback (void *cls, const char *emsg)
+{
+  if (emsg != NULL)
+  {
+#if VERBOSE
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Shutdown of peers failed!\n");
+#endif
+    ok++;
+  }
+  else
+  {
+#if VERBOSE
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: All peers successfully shut down!\n");
+#endif
+  }
+}
+
+
+static void
+shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+#if VERBOSE
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Ending test.\n");
+#endif
+
+  if (disconnect_task != GNUNET_SCHEDULER_NO_TASK)
+  {
+    GNUNET_SCHEDULER_cancel (disconnect_task);
+    disconnect_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+
+  if (data_file != NULL)
+    GNUNET_DISK_file_close (data_file);
+  GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+  GNUNET_CONFIGURATION_destroy (testing_cfg);
+}
+
+
+/**
+ * Handlers, for diverse services
+ */
+static struct GNUNET_MESH_MessageHandler handlers[] = {
+//    {&callback, 1, 0},
+  {NULL, 0, 0}
+};
+
+
+/**
+ * Method called whenever another peer has added us to a tunnel
+ * the other peer initiated.
+ *
+ * @param cls closure
+ * @param tunnel new handle to the tunnel
+ * @param initiator peer that started the tunnel
+ * @param atsi performance information for the tunnel
+ * @return initial tunnel context for the tunnel
+ *         (can be NULL -- that's not an error)
+ */
+static void *
+incoming_tunnel (void *cls,
+                 struct GNUNET_MESH_Tunnel * tunnel,
+                 const struct GNUNET_PeerIdentity * initiator,
+                 const struct GNUNET_TRANSPORT_ATS_Information * atsi)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "test: Incoming tunnel from %s\n",
+              GNUNET_h2s(&initiator->hashPubKey));
+  GNUNET_MESH_tunnel_destroy(t);
+  ok = 0;
+  return NULL;
+}
+
+/**
+ * Function called whenever an inbound tunnel is destroyed.  Should clean up
+ * any associated state.
+ *
+ * @param cls closure (set from GNUNET_MESH_connect)
+ * @param tunnel connection to the other end (henceforth invalid)
+ * @param tunnel_ctx place where local state associated
+ *                   with the tunnel is stored
+ */
+static void
+tunnel_cleaner (void *cls, const struct GNUNET_MESH_Tunnel *tunnel,
+                void *tunnel_ctx)
+{
+#if VERBOSE
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: tunnel disconnected\n");
+#endif
+  
+  return;
+}
+
+/**
+ * Method called whenever a tunnel falls apart.
+ *
+ * @param cls closure
+ * @param peer peer identity the tunnel stopped working with
+ */
+static void
+dh (void *cls, const struct GNUNET_PeerIdentity *peer)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: peer disconnected\n");
+  return;
+}
+
+
+/**
+ * Method called whenever a tunnel is established.
+ *
+ * @param cls closure
+ * @param peer peer identity the tunnel was created to, NULL on timeout
+ * @param atsi performance data for the connection
+ */
+static void
+ch (void *cls, const struct GNUNET_PeerIdentity *peer,
+    const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: peer connected\n");
+  return;
+}
+
+
+static void
+disconnect_mesh_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "test: disconnecting mesh service of peers\n");
+  disconnect_task = GNUNET_SCHEDULER_NO_TASK;
+  GNUNET_MESH_disconnect(h1);
+  GNUNET_MESH_disconnect(h2);
+  GNUNET_SCHEDULER_cancel (shutdown_handle);
+  shutdown_handle = GNUNET_SCHEDULER_add_now(&shutdown_task, NULL);
+}
+
+
+static void
+do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: test_task\n");
+  GNUNET_MESH_peer_request_connect_add(t, &d2->id);
+  GNUNET_SCHEDULER_cancel (disconnect_task);
+  disconnect_task = GNUNET_SCHEDULER_add_delayed(
+          GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10),
+                               &disconnect_mesh_peers, NULL);
+}
+
+
+/**
+ * connect_mesh_service: connect to the mesh service of one of the peers
+ *
+ */
+static void
+connect_mesh_service (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_MESH_ApplicationType app;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: connect_mesh_service\n");
+
+  d1 = GNUNET_TESTING_daemon_get (pg, 1);
+  d2 = GNUNET_TESTING_daemon_get (pg, 13);
+  app = (GNUNET_MESH_ApplicationType) 0;
+
+#if VERBOSE
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "test: connecting to mesh service of peer %s\n", GNUNET_i2s (&d1->id));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "test: connecting to mesh service of peer %s\n", GNUNET_i2s (&d2->id));
+#endif
+  h1 = GNUNET_MESH_connect (d1->cfg, 10, NULL, NULL, &tunnel_cleaner, handlers,
+                           &app);
+  h2 = GNUNET_MESH_connect (d2->cfg,
+                            10,
+                            NULL,
+                            &incoming_tunnel,
+                            &tunnel_cleaner,
+                            handlers,
+                            &app);
+#if VERBOSE
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: connected to mesh service of peer %s\n",
+              GNUNET_i2s (&d1->id));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: connected to mesh service of peer %s\n",
+              GNUNET_i2s (&d2->id));
+#endif
+  t = GNUNET_MESH_tunnel_create (h1, NULL, &ch, &dh, NULL);
+  test_task =
+      GNUNET_SCHEDULER_add_delayed(
+          GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10),
+          &do_test, NULL);
+}
+
+
+
+/**
+ * peergroup_ready: start test when all peers are connected
+ * @param cls closure
+ * @param emsg error message
+ */
+static void
+peergroup_ready (void *cls, const char *emsg)
+{
+  char *buf;
+  int buf_len;
+
+  if (emsg != NULL)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "test: Peergroup callback called with error, aborting test!\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "test: Error from testing: `%s'\n", emsg);
+    ok++;
+    GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+    return;
+  }
+#if VERBOSE
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "************************************************************\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "test: Peer Group started successfully!\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "test: Have %u connections\n",
+              total_connections);
+#endif
+
+  if (data_file != NULL)
+  {
+    buf = NULL;
+    buf_len = GNUNET_asprintf (&buf, "CONNECTIONS_0: %u\n", total_connections);
+    if (buf_len > 0)
+      GNUNET_DISK_file_write (data_file, buf, buf_len);
+    GNUNET_free (buf);
+  }
+  peers_running = GNUNET_TESTING_daemons_running (pg);
+
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(
+                                    GNUNET_TIME_UNIT_SECONDS,
+                                    5),
+                                &connect_mesh_service,
+                                NULL);
+  disconnect_task =
+      GNUNET_SCHEDULER_add_delayed (wait_time, &disconnect_mesh_peers, NULL);
+
+}
+
+
+/**
+ * Function that will be called whenever two daemons are connected by
+ * the testing library.
+ *
+ * @param cls closure
+ * @param first peer id for first daemon
+ * @param second peer id for the second daemon
+ * @param distance distance between the connected peers
+ * @param first_cfg config for the first daemon
+ * @param second_cfg config for the second daemon
+ * @param first_daemon handle for the first daemon
+ * @param second_daemon handle for the second daemon
+ * @param emsg error message (NULL on success)
+ */
+static void
+connect_cb (void *cls, const struct GNUNET_PeerIdentity *first,
+            const struct GNUNET_PeerIdentity *second, uint32_t distance,
+            const struct GNUNET_CONFIGURATION_Handle *first_cfg,
+            const struct GNUNET_CONFIGURATION_Handle *second_cfg,
+            struct GNUNET_TESTING_Daemon *first_daemon,
+            struct GNUNET_TESTING_Daemon *second_daemon, const char *emsg)
+{
+  GNUNET_PEER_Id f;
+  GNUNET_PEER_Id s;
+
+  if (emsg == NULL)
+    total_connections++;
+  f = GNUNET_PEER_intern(first);
+  s = GNUNET_PEER_intern(second);
+//   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: New connection!\n");
+//   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+//               "test:     %s (%u)\n",
+//               GNUNET_h2s(&first->hashPubKey),
+//               f);
+//   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+//               "test:     %s (%u)\n",
+//               GNUNET_h2s(&second->hashPubKey),
+//               s);
+}
+
+
+/**
+ * run: load configuration options and schedule test to run (start peergroup)
+ * @param cls closure
+ * @param args argv
+ * @param cfgfile configuration file name (can be NULL)
+ * @param cfg configuration handle
+ */
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  char *temp_str;
+  unsigned long long temp_wait;
+  struct GNUNET_TESTING_Host *hosts;
+
+  ok = 1;
+  testing_cfg = GNUNET_CONFIGURATION_dup (cfg);
+
+  GNUNET_log_setup ("test_mesh_small_unicast",
+#if VERBOSE
+                    "DEBUG",
+#else
+                    "WARNING",
+#endif
+                    NULL);
+
+#if VERBOSE
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Starting daemons.\n");
+  GNUNET_CONFIGURATION_set_value_string (testing_cfg, "testing",
+                                         "use_progressbars", "YES");
+#endif
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing",
+                                             "num_peers", &num_peers))
+  {
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_CONFIGURATION_load (testing_cfg,
+                                              "test_mesh_small.conf"));
+    if (GNUNET_OK !=
+        GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing",
+                                               "num_peers", &num_peers))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Option TESTING:NUM_PEERS is required!\n");
+      return;
+    }
+  }
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_number (testing_cfg, "test_mesh_small",
+                                             "wait_time", &temp_wait))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Option test_mesh_small:wait_time is required!\n");
+    return;
+  }
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (testing_cfg, "testing",
+                                             "topology_output_file",
+                                             &topology_file))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Option test_mesh_small:topology_output_file is required!\n");
+    return;
+  }
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (testing_cfg, "test_mesh_small",
+                                             "data_output_file",
+                                             &data_filename))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Option test_mesh_small:data_output_file is required!\n");
+    return;
+  }
+
+  data_file =
+      GNUNET_DISK_file_open (data_filename,
+                             GNUNET_DISK_OPEN_READWRITE |
+                             GNUNET_DISK_OPEN_CREATE,
+                             GNUNET_DISK_PERM_USER_READ |
+                             GNUNET_DISK_PERM_USER_WRITE);
+  if (data_file == NULL)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to open %s for output!\n",
+                data_filename);
+    GNUNET_free (data_filename);
+  }
+
+  wait_time =
+      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_wait);
+
+  if (GNUNET_YES ==
+      GNUNET_CONFIGURATION_get_value_string (cfg, "test_mesh_small",
+                                             "output_file", &temp_str))
+  {
+    output_file =
+        GNUNET_DISK_file_open (temp_str,
+                               GNUNET_DISK_OPEN_READWRITE |
+                               GNUNET_DISK_OPEN_CREATE,
+                               GNUNET_DISK_PERM_USER_READ |
+                               GNUNET_DISK_PERM_USER_WRITE);
+    if (output_file == NULL)
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to open %s for output!\n",
+                  temp_str);
+  }
+  GNUNET_free_non_null (temp_str);
+
+  hosts = GNUNET_TESTING_hosts_load (testing_cfg);
+
+  pg = GNUNET_TESTING_peergroup_start (testing_cfg, num_peers, TIMEOUT,
+                                       &connect_cb, &peergroup_ready, NULL,
+                                       hosts);
+  GNUNET_assert (pg != NULL);
+  shutdown_handle =
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_get_forever (),
+                                    &shutdown_task, NULL);
+}
+
+
+
+/**
+ * test_mesh_small command line options
+ */
+static struct GNUNET_GETOPT_CommandLineOption options[] = {
+  {'V', "verbose", NULL,
+   gettext_noop ("be verbose (print progress information)"),
+   0, &GNUNET_GETOPT_set_one, &verbose},
+  GNUNET_GETOPT_OPTION_END
+};
+
+
+/**
+ * Main: start test
+ */
+int
+main (int argc, char *argv[])
+{
+  GNUNET_PROGRAM_run (argc, argv, "test_mesh_small_unicast",
+                      gettext_noop ("Test mesh unicast in a small network."), options,
+                      &run, NULL);
+#if REMOVE_DIR
+  GNUNET_DISK_directory_remove ("/tmp/test_mesh_small_unicast");
+#endif
+  if (0 != ok)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "test: FAILED!\n");
+  }
+  return ok;
+}
+
+/* end of test_mesh_small_unicast.c */