Refactored multicast code to allow sending any message as multicast, added multicast testcase copied from unicast

3 files changed, 885 insertions, 60 deletions

diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index 391d86f80..2c4dc0b4c 100644
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -56,7 +56,8 @@ check_PROGRAMS = \
  test_mesh_local_2 \
  test_mesh_small \
  test_mesh_small_unicast \
- test_mesh_small_unicast_far
+ test_mesh_small_unicast_far \
+ test_mesh_small_multicast
 
 test_mesh_api_SOURCES = \
  test_mesh_api.c
@@ -119,8 +120,18 @@ test_mesh_small_unicast_far_LDADD = \
 test_mesh_small_unicast_far_DEPENDENCIES = \
   libgnunetmeshnew.la
 
+test_mesh_small_multicast_SOURCES = \
+ test_mesh_small_multicast.c
+test_mesh_small_multicast_LDADD = \
+  $(top_builddir)/src/mesh/libgnunetmeshnew.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la
+test_mesh_small_multicast_DEPENDENCIES = \
+  libgnunetmeshnew.la
+
+
 if ENABLE_TEST_RUN
-TESTS = test_mesh_api test_mesh_path_api test_mesh_local_1 test_mesh_local_2 test_mesh_small
+TESTS = test_mesh_api test_mesh_path_api test_mesh_local_1 test_mesh_local_2 test_mesh_small test_mesh_small_unicast
 endif
 
 EXTRA_DIST = \
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c
index 434e448af..da0af99b1 100644
--- a/src/mesh/gnunet-service-mesh.c
+++ b/src/mesh/gnunet-service-mesh.c
@@ -813,6 +813,21 @@ static size_t
 send_core_create_path (void *cls, size_t size, void *buf);
 
 /**
+ * Function called to notify a client about the socket
+ * being ready to queue more data.  "buf" will be
+ * NULL and "size" zero if the socket was closed for
+ * writing in the meantime.
+ *
+ * @param cls closure (data itself)
+ * @param size number of bytes available in buf
+ * @param buf where the callee should write the message
+ *
+ * @return number of bytes written to buf
+ */
+static size_t
+send_core_data_multicast (void *cls, size_t size, void *buf);
+
+/**
  * Cancel a core transmission that was already requested and free all resources
  * associated to the request.
  * 
@@ -1601,6 +1616,82 @@ tunnel_notify_connection_broken (struct MeshTunnel *t,
 
 
 /**
+ * Send a message in a tunnel in multicast, sending a copy to each child node
+ * down the local one in the tunnel tree.
+ *
+ * @param t Tunnel in which to send the data.
+ * @param msg Message to be sent
+ *
+ * @return Number of copies sent.
+ */
+static int
+tunnel_send_multicast (struct MeshTunnel *t,
+                       const struct GNUNET_MessageHeader *msg)
+{
+  struct GNUNET_PeerIdentity *neighbor;
+  struct MeshDataDescriptor *info;
+  struct MeshTunnelTreeNode *n;
+  unsigned int *copies;
+  unsigned int i;
+  size_t size;
+  void *data;
+
+  size = ntohs (msg->size);
+  GNUNET_assert (NULL != t->tree->me);
+  n = t->tree->me->children_head;
+  if (NULL == n)
+    return 0;
+  copies = GNUNET_malloc (sizeof (unsigned int));
+  for (*copies = 0; NULL != n; n = n->next)
+    (*copies)++;
+  n = t->tree->me->children_head;
+  data = GNUNET_malloc (size);
+  memcpy (data, &msg, size);
+  while (NULL != n)
+  {
+    info = GNUNET_malloc (sizeof (struct MeshDataDescriptor));
+    info->origin = &t->id;
+    info->data = data;
+    info->size = size;
+    info->copies = copies;
+    if (NULL != t->client->handle)
+    {
+      info->client = t->client->handle;
+
+      info->timeout_task = GNUNET_SCHEDULER_add_delayed (UNACKNOWLEDGED_WAIT,
+                                                         &client_allow_send,
+                                                         t->client->handle);
+    }
+    info->destination = n->peer;
+    neighbor = path_get_first_hop(t->tree, n->peer);
+    info->peer = peer_info_get(neighbor);
+    GNUNET_assert (NULL != info->peer);
+    for (i = 0; NULL != info->peer->core_transmit[i]; i++)
+    {
+      if (i == (CORE_QUEUE_SIZE - 1))
+      {
+        GNUNET_free (info);
+        GNUNET_break (0);
+        return GNUNET_OK;
+      }
+    }
+    info->handler_n = i;
+    info->peer->infos[i] = info;
+    info->peer->types[i] = GNUNET_MESSAGE_TYPE_MESH_MULTICAST;
+    info->peer->core_transmit[i] =
+        GNUNET_CORE_notify_transmit_ready (core_handle,
+                                           0,
+                                           0,
+                                           GNUNET_TIME_UNIT_FOREVER_REL,
+                                           neighbor,
+                                           size,
+                                           &send_core_data_multicast, info);
+  }
+  return *copies;
+}
+
+
+/**
  * Destroy the tunnel and free any allocated resources linked to it
  *
  * @param t the tunnel to destroy
@@ -1846,12 +1937,12 @@ static size_t
 send_core_data_multicast (void *cls, size_t size, void *buf)
 {
   struct MeshDataDescriptor *info = cls;
-  struct GNUNET_MESH_Multicast *msg = buf;
+  struct GNUNET_MessageHeader *msg = buf;
   size_t total_size;
 
   GNUNET_assert (NULL != info);
   GNUNET_assert (NULL != info->peer);
-  total_size = info->size + sizeof (struct GNUNET_MESH_Multicast);
+  total_size = info->size;
   GNUNET_assert (total_size < GNUNET_SERVER_MAX_MESSAGE_SIZE);
 
   if (total_size > size)
@@ -1860,8 +1951,6 @@ send_core_data_multicast (void *cls, size_t size, void *buf)
     struct GNUNET_PeerIdentity id;
 
     GNUNET_PEER_resolve(info->peer->id, &id);
-    info->peer->infos[info->handler_n] = info;
-    info->peer->types[info->handler_n] = GNUNET_MESSAGE_TYPE_MESH_MULTICAST;
     info->peer->core_transmit[info->handler_n] =
       GNUNET_CORE_notify_transmit_ready (core_handle,
                                          0,
@@ -1875,11 +1964,7 @@ send_core_data_multicast (void *cls, size_t size, void *buf)
   }
   info->peer->core_transmit[info->handler_n] = NULL;
   info->peer->infos[info->handler_n] = NULL;
-  msg->header.type = htons (GNUNET_MESSAGE_TYPE_MESH_MULTICAST);
-  msg->header.size = htons (total_size);
-  GNUNET_PEER_resolve (info->origin->oid, &msg->oid);
-  msg->tid = htonl (info->origin->tid);
-  memcpy (&msg[1], info->data, info->size);
+  memcpy (&msg, info->data, total_size);
   if (0 == --(*info->copies))
   {
     if (NULL != info->client)
@@ -2273,14 +2358,8 @@ handle_mesh_data_multicast (void *cls, const struct GNUNET_PeerIdentity *peer,
                             const struct GNUNET_ATS_Information *atsi)
 {
   struct GNUNET_MESH_Multicast *msg;
-  struct GNUNET_PeerIdentity *id;
-  struct MeshDataDescriptor *info;
-  struct MeshTunnelTreeNode *n;
   struct MeshTunnel *t;
-  unsigned int *copies;
-  unsigned int i;
   size_t size;
-  void *data;
 
   size = ntohs (message->size) - sizeof (struct GNUNET_MESH_Multicast);
   if (size < sizeof (struct GNUNET_MessageHeader))
@@ -2303,48 +2382,7 @@ handle_mesh_data_multicast (void *cls, const struct GNUNET_PeerIdentity *peer,
   {
     send_subscribed_clients (message, (struct GNUNET_MessageHeader *) &msg[1]);
   }
-  n = t->tree->me->children_head;
-  if (NULL == n)
-    return GNUNET_OK;
-  copies = GNUNET_malloc (sizeof (unsigned int));
-  for (*copies = 0; NULL != n; n = n->next)
-    (*copies)++;
-  n = t->tree->me->children_head;
-  data = GNUNET_malloc (size);
-  memcpy (data, &msg[1], size);
-  while (NULL != n)
-  {
-    info = GNUNET_malloc (sizeof (struct MeshDataDescriptor));
-    info->origin = &t->id;
-    info->data = data;
-    info->size = size;
-    info->copies = copies;
-    info->client = t->client->handle;
-    info->timeout_task = GNUNET_SCHEDULER_add_delayed(UNACKNOWLEDGED_WAIT,
-                                                      &client_allow_send,
-                                                      t->client->handle);
-    info->destination = n->peer;
-    id = path_get_first_hop(t->tree, n->peer);
-    info->peer = peer_info_get(id);
-    GNUNET_assert (NULL != info->peer);
-    for (i = 0; NULL != info->peer->core_transmit[i]; i++)
-    {
-      if (i == (CORE_QUEUE_SIZE - 1))
-      {
-        GNUNET_free (info);
-        GNUNET_break (0);
-        return GNUNET_OK;
-      }
-    }
-    info->handler_n = i;
-    info->peer->infos[i] = info;
-    info->peer->types[i] = GNUNET_MESSAGE_TYPE_MESH_MULTICAST;
-    info->peer->core_transmit[i] =
-        GNUNET_CORE_notify_transmit_ready (core_handle, 0, 0,
-                                           GNUNET_TIME_UNIT_FOREVER_REL, id,
-                                           ntohs (msg->header.size),
-                                           &send_core_data_multicast, info);
-  }
+  tunnel_send_multicast(t, message);
 
   return GNUNET_OK;
 }
@@ -3083,7 +3121,7 @@ handle_local_tunnel_destroy (void *cls, struct GNUNET_SERVER_Client *client,
   t = GNUNET_CONTAINER_multihashmap_get (c->tunnels, &hash);
   GNUNET_CONTAINER_multihashmap_remove (c->tunnels, &hash, t);
 
-//     notify_tunnel_destroy(t); FIXME
+//   notify_tunnel_destroy(t);
   tunnel_destroy(t);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
   return;
diff --git a/src/mesh/test_mesh_small_mulicast.c b/src/mesh/test_mesh_small_mulicast.c
new file mode 100644
index 000000000..bb76e0878
--- /dev/null
+++ b/src/mesh/test_mesh_small_mulicast.c
@@ -0,0 +1,776 @@
+/*
+     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_multicast.c
+ *
+ * @brief Test for the mesh service: retransmission of multicast 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;
+};
+
+
+/**
+ * How long until we give up on connecting the peers?
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1500)
+
+/**
+ * Time to wait for stuff that should be rather fast
+ */
+#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+
+#define OK_GOAL 4
+
+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;
+
+static struct GNUNET_TESTING_Daemon *d1;
+
+static GNUNET_PEER_Id pid1;
+
+static struct GNUNET_TESTING_Daemon *d2;
+
+static struct GNUNET_MESH_Handle *h1;
+
+static struct GNUNET_MESH_Handle *h2;
+
+static struct GNUNET_MESH_Tunnel *t;
+
+static struct GNUNET_MESH_Tunnel *incoming_t;
+
+static uint16_t *mesh_peers;
+
+/**
+ * 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);
+}
+
+
+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);
+}
+
+
+/**
+ * Transmit ready callback
+ */
+size_t
+tmt_rdy (void *cls, size_t size, void *buf)
+{
+  struct GNUNET_MessageHeader *msg = buf;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test:  tmt_rdy called\n");
+  if (size < sizeof(struct GNUNET_MessageHeader) || NULL == buf)
+    return 0;
+  msg->size = htons (sizeof(struct GNUNET_MessageHeader));
+  msg->type = htons ((long) cls);
+  return sizeof(struct GNUNET_MessageHeader);
+}
+
+
+/**
+ * Function is called whenever a message is received.
+ *
+ * @param cls closure (set from GNUNET_MESH_connect)
+ * @param tunnel connection to the other end
+ * @param tunnel_ctx place to store local state associated with the tunnel
+ * @param sender who sent the message
+ * @param message the actual message
+ * @param atsi performance data for the connection
+ * @return GNUNET_OK to keep the connection open,
+ *         GNUNET_SYSERR to close it (signal serious error)
+ */
+int
+data_callback (void *cls,
+          struct GNUNET_MESH_Tunnel * tunnel,
+          void **tunnel_ctx,
+          const struct GNUNET_PeerIdentity *sender,
+          const struct GNUNET_MessageHeader *message,
+          const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+{
+  long client = (long) cls;
+
+  switch (client)
+  {
+    case 1L:
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "test: Origin client got a response!\n");
+      ok++;
+      GNUNET_SCHEDULER_cancel (disconnect_task);
+      disconnect_task = GNUNET_SCHEDULER_add_now(&disconnect_mesh_peers,
+                                                 NULL);
+      break;
+    case 2L:
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "test: Destination client got a message \n");
+      ok++;
+      GNUNET_MESH_notify_transmit_ready(incoming_t,
+                                        GNUNET_NO,
+                                        0,
+                                        GNUNET_TIME_UNIT_FOREVER_REL,
+                                        sender,
+                                        sizeof(struct GNUNET_MessageHeader),
+                                        &tmt_rdy,
+                                        (void *) 1L);
+      GNUNET_SCHEDULER_cancel (disconnect_task);
+      disconnect_task = GNUNET_SCHEDULER_add_delayed(SHORT_TIME,
+                                                     &disconnect_mesh_peers,
+                                                     NULL);
+      break;
+    default:
+      break;
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Handlers, for diverse services
+ */
+static struct GNUNET_MESH_MessageHandler handlers[] = {
+  {&data_callback, 1, sizeof(struct GNUNET_MessageHeader)},
+  {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_i2s(initiator));
+  ok++;
+  incoming_t = tunnel;
+  GNUNET_SCHEDULER_cancel (disconnect_task);
+  disconnect_task = GNUNET_SCHEDULER_add_delayed(SHORT_TIME,
+                                                 &disconnect_mesh_peers,
+                                                 NULL);
+  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 %s disconnected\n",
+              GNUNET_i2s(peer));
+  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 %s connected\n",
+              GNUNET_i2s(peer));
+  if (0 == memcmp(&d2->id, peer, sizeof(d2->id)) && (long) cls == 1L)
+    ok++;
+  if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
+  {
+    GNUNET_SCHEDULER_cancel (disconnect_task);
+    disconnect_task = GNUNET_SCHEDULER_add_delayed(SHORT_TIME,
+                                                    &disconnect_mesh_peers,
+                                                    NULL);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Sending data multicast...\n");
+    GNUNET_MESH_notify_transmit_ready(t,
+                                      GNUNET_NO,
+                                      0,
+                                      GNUNET_TIME_UNIT_FOREVER_REL,
+                                      &d2->id,
+                                      sizeof(struct GNUNET_MessageHeader),
+                                      &tmt_rdy,
+                                      (void *) 1L);
+  }
+  return;
+}
+
+
+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, 30),
+                               &disconnect_mesh_peers, NULL);
+}
+
+
+/**
+ * Prototype of a callback function indicating that two peers
+ * are currently connected.
+ *
+ * @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 emsg error message (NULL on success)
+ */
+void
+topo_cb (void *cls,
+         const struct GNUNET_PeerIdentity* first,
+         const struct GNUNET_PeerIdentity* second,
+         const char *emsg)
+{
+  GNUNET_PEER_Id p1;
+  GNUNET_PEER_Id p2;
+  struct GNUNET_PeerIdentity id;
+
+  GNUNET_PEER_resolve(1, &id);
+  p1 = GNUNET_PEER_search(first);
+  if (p1 == pid1)
+  {
+    p2 = GNUNET_PEER_search(second);
+    GNUNET_assert(p2 < num_peers);
+    GNUNET_assert(p2 > 0);
+    mesh_peers[p2]++;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "test: %s IS a neighbor\n",
+                GNUNET_i2s(second));
+    return;
+  }
+  p1 = GNUNET_PEER_search(second);
+  if (p1 == pid1)
+  {
+    p2 = GNUNET_PEER_search(first);
+    GNUNET_assert(p2 < num_peers);
+    GNUNET_assert(p2 > 0);
+    mesh_peers[p2]++;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "test: %s IS a neighbor\n",
+                GNUNET_i2s(first));
+    return;
+  }
+}
+
+/**
+ * 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;
+  unsigned int i;
+  struct GNUNET_PeerIdentity id;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: connect_mesh_service\n");
+
+  for (i = 1; i <= num_peers; i++)
+  {
+    GNUNET_PEER_resolve(i, &id);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "test:   peer %s has %u conns to d1\n",
+              GNUNET_i2s (&id),
+              mesh_peers[i]);
+    if (mesh_peers[i] == 0)
+      break;
+  }
+  GNUNET_assert (i < num_peers);
+  d2 = GNUNET_TESTING_daemon_get_by_id (pg, &id);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "test: Peer searched: %s\n",
+              GNUNET_i2s (&d2->id));
+  app = (GNUNET_MESH_ApplicationType) 0;
+
+#if VERBOSE
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "test: connecting to mesh service of peer %s (%u)\n",
+              GNUNET_i2s (&d1->id),
+              mesh_peers[0]);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "test: connecting to mesh service of peer %s (%u)\n",
+              GNUNET_i2s (&d2->id),
+              i);
+#endif
+  h1 = GNUNET_MESH_connect (d1->cfg,
+                            10,
+                            (void *) 1L,
+                            NULL,
+                            &tunnel_cleaner,
+                            handlers,
+                            &app);
+  h2 = GNUNET_MESH_connect (d2->cfg,
+                            10,
+                            (void *) 2L,
+                            &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, (void *) 1L);
+  test_task =
+      GNUNET_SCHEDULER_add_delayed(
+          GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 6),
+          &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;
+  unsigned int i;
+
+  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);
+  for (i = 0; i < num_peers; i++)
+  {
+    d1 = GNUNET_TESTING_daemon_get (pg, i);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "test:   %u: %s\n",
+                GNUNET_PEER_intern(&d1->id),
+                GNUNET_i2s (&d1->id));
+  }
+  d1 = GNUNET_TESTING_daemon_get (pg, 0);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "test: Peer looking: %s\n",
+              GNUNET_i2s (&d1->id));
+  pid1 = GNUNET_PEER_intern(&d1->id);
+  mesh_peers[pid1] = 100;
+  GNUNET_TESTING_get_topology(pg, &topo_cb, NULL);
+
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(
+                                    GNUNET_TIME_UNIT_SECONDS,
+                                    4),
+                                &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)
+{
+  if (emsg == NULL)
+  {
+    total_connections++;
+  }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "test: Problem with new connection (%s)\n",
+                emsg);
+  }
+
+}
+
+
+/**
+ * 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 = 0;
+  testing_cfg = GNUNET_CONFIGURATION_dup (cfg);
+
+  GNUNET_log_setup ("test_mesh_small_multicast",
+#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;
+    }
+  }
+
+  mesh_peers = GNUNET_malloc (sizeof(GNUNET_PEER_Id) * (num_peers + 1));
+
+  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_multicast",
+                      gettext_noop ("Test mesh multicast in a small network."),
+                      options, &run, NULL);
+#if REMOVE_DIR
+  GNUNET_DISK_directory_remove ("/tmp/test_mesh_small_multicast");
+#endif
+  if (OK_GOAL != ok)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "test: FAILED! (%d/%d)\n",
+                ok, OK_GOAL);
+    return 1;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: success\n");
+  return 0;
+}
+
+/* end of test_mesh_small_multicast.c */