clean up for configs
[oweals/gnunet.git] / src / mesh / test_mesh_small.c
index 53f00a24f83ea2159cd464db37d5c4cd576ca0f7..368c07a97e9d370e2d7553abc1f347ac46397623 100644 (file)
 /**
  * @file mesh/test_mesh_small.c
  *
- * @brief Test for the mesh service.
+ * @brief Test for the mesh service: retransmission of traffic.
  */
+#include <stdio.h>
 #include "platform.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_mesh_service_new.h"
+#include "mesh_test_lib.h"
+#include "gnunet_mesh_service.h"
+#include <gauger.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;
-};
+/**
+ * How namy messages to send
+ */
+#define TOTAL_PACKETS 1000
 
+/**
+ * How long until we give up on connecting the peers?
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
 
-struct StatsContext
-{
-  unsigned long long total_mesh_bytes;
-};
+/**
+ * Time to wait for stuff that should be rather fast
+ */
+#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
 
+/**
+ * DIFFERENT TESTS TO RUN
+ */
+#define SETUP 0
+#define FORWARD 1
+#define SPEED 3
+#define SPEED_ACK 4
+#define SPEED_REL 8
+#define P2P_SIGNAL 10
 
-// static struct MeshPeer *peer_head;
-//
-// static struct MeshPeer *peer_tail;
+/**
+ * Which test are we running?
+ */
+static int test;
 
 /**
- * How long until we give up on connecting the peers?
+ * String with test name
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1500)
+char *test_name;
 
-static int ok;
+/**
+ * Flag to send traffic leaf->root in speed tests to test BCK_ACK logic.
+ */
+static int test_backwards = GNUNET_NO;
 
 /**
- * Be verbose
+ * How many events have happened
  */
-static int verbose;
+static int ok;
+
+ /**
+  * Each peer is supposed to generate the following callbacks:
+  * 1 incoming channel (@dest)
+  * 1 connected peer (@orig)
+  * 1 received data packet (@dest)
+  * 1 received data packet (@orig)
+  * 1 received channel destroy (@dest)
+  * _________________________________
+  * 5 x ok expected per peer
+  */
+int ok_goal;
+
 
 /**
- * Total number of peers in the test.
+ * Size of each test packet
  */
-static unsigned long long num_peers;
+size_t size_payload = sizeof (struct GNUNET_MessageHeader) + sizeof (uint32_t);
 
 /**
- * Global configuration file
+ * Operation to get peer ids.
  */
-static struct GNUNET_CONFIGURATION_Handle *testing_cfg;
+struct GNUNET_TESTBED_Operation *t_op[2];
 
 /**
- * Total number of currently running peers.
+ * Peer ids.
  */
-static unsigned long long peers_running;
+struct GNUNET_PeerIdentity *p_id[2];
 
 /**
- * Current round we are in.
+ * Peer ids counter.
  */
-static unsigned long long current_round;
+unsigned int p_ids;
 
 /**
- * Peers desired in the next round.
+ * Is the setup initialized?
  */
-static unsigned long long peers_next_round;
+static int initialized;
 
 /**
- * Total number of connections in the whole network.
+ * Number of payload packes sent
  */
-static unsigned int total_connections;
+static int data_sent;
 
 /**
- * The currently running peer group.
+ * Number of payload packets received
  */
-static struct GNUNET_TESTING_PeerGroup *pg;
+static int data_received;
 
 /**
- * File to report results to.
+ * Number of payload packed explicitly (app level) acknowledged
  */
-static struct GNUNET_DISK_FileHandle *output_file;
+static int data_ack;
 
 /**
- * File to log connection info, statistics to.
+ * Total number of currently running peers.
  */
-static struct GNUNET_DISK_FileHandle *data_file;
+static unsigned long long peers_running;
 
 /**
- * How many data points to capture before triggering next round?
+ * Test context (to shut down).
  */
-static struct GNUNET_TIME_Relative wait_time;
+struct GNUNET_MESH_TEST_Context *test_ctx;
 
 /**
  * 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;
 
 /**
- * Task used to churn the network.
+ * Mesh handle for the root peer
  */
-static GNUNET_SCHEDULER_TaskIdentifier churn_task;
-
-static char *topology_file;
-
-static char *data_filename;
+static struct GNUNET_MESH_Handle *h1;
 
 /**
- * Check whether peers successfully shut down.
+ * Mesh handle for the first leaf peer
  */
-static void
-shutdown_callback (void *cls, const char *emsg)
-{
-  if (emsg != NULL)
-  {
-#if VERBOSE
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown of peers failed!\n");
-#endif
-    if (ok == 0)
-      ok = 666;
-  }
-  else
-  {
-#if VERBOSE
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers successfully shut down!\n");
-#endif
-    ok = 0;
-  }
-}
+static struct GNUNET_MESH_Handle *h2;
 
+/**
+ * Channel handle for the root peer
+ */
+static struct GNUNET_MESH_Channel *ch;
 
-static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-//   struct NSEPeer *pos;
-#if VERBOSE
-  fprintf (stderr, "Ending test.\n");
-#endif
+/**
+ * Channel handle for the dest peer
+ */
+static struct GNUNET_MESH_Channel *incoming_ch;
 
-  if (disconnect_task != GNUNET_SCHEDULER_NO_TASK)
-  {
-    GNUNET_SCHEDULER_cancel (disconnect_task);
-    disconnect_task = GNUNET_SCHEDULER_NO_TASK;
-  }
-//   while (NULL != (pos = peer_head))
-//     {
-//       if (pos->nse_handle != NULL)
-//         GNUNET_NSE_disconnect(pos->nse_handle);
-//       GNUNET_CONTAINER_DLL_remove(peer_head, peer_tail, pos);
-//       GNUNET_free(pos);
-//     }
-
-  if (data_file != NULL)
-    GNUNET_DISK_file_close (data_file);
-  GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
-  GNUNET_CONFIGURATION_destroy (testing_cfg);
-}
+/**
+ * Time we started the data transmission (after channel has been established
+ * and initilized).
+ */
+static struct GNUNET_TIME_Absolute start_time;
 
 
 /**
- * Handlers, for diverse services
+ * Show the results of the test (banwidth acheived) and log them to GAUGER
  */
-static struct GNUNET_MESH_MessageHandler handlers[] = {
-//    {&callback, 1, 0},
-  {NULL, 0, 0}
-};
+static void
+show_end_data (void)
+{
+  static struct GNUNET_TIME_Absolute end_time;
+  static struct GNUNET_TIME_Relative total_time;
+
+  end_time = GNUNET_TIME_absolute_get();
+  total_time = GNUNET_TIME_absolute_get_difference(start_time, end_time);
+  FPRINTF (stderr, "\nResults of test \"%s\"\n", test_name);
+  FPRINTF (stderr, "Test time %s\n",
+          GNUNET_STRINGS_relative_time_to_string (total_time,
+                                                  GNUNET_YES));
+  FPRINTF (stderr, "Test bandwidth: %f kb/s\n",
+          4 * TOTAL_PACKETS * 1.0 / (total_time.rel_value_us / 1000)); // 4bytes * ms
+  FPRINTF (stderr, "Test throughput: %f packets/s\n\n",
+          TOTAL_PACKETS * 1000.0 / (total_time.rel_value_us / 1000)); // packets * ms
+  GAUGER ("MESH", test_name,
+          TOTAL_PACKETS * 1000.0 / (total_time.rel_value_us / 1000),
+          "packets/s");
+}
 
 
 /**
- * Function called whenever an inbound tunnel is destroyed.  Should clean up
- * any associated state.
+ * Shut down peergroup, clean up.
  *
- * @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
+ * @param cls Closure (unused).
+ * @param tc Task Context.
  */
 static void
-tunnel_cleaner (void *cls, const struct GNUNET_MESH_Tunnel *tunnel,
-                void **tunnel_ctx)
+shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-#if VERBOSE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "tunnel disconnected\n");
-#endif
-  return;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ending test.\n");
+  shutdown_handle = GNUNET_SCHEDULER_NO_TASK;
 }
 
+
 /**
- * Method called whenever a tunnel falls apart.
+ * Disconnect from mesh services af all peers, call shutdown.
  *
- * @param cls closure
- * @param peer peer identity the tunnel stopped working with
+ * @param cls Closure (unused).
+ * @param tc Task Context.
  */
 static void
-dh (void *cls, const struct GNUNET_PeerIdentity *peer)
+disconnect_mesh_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "peer disconnected\n");
-  return;
+  long line = (long) cls;
+  unsigned int i;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "disconnecting mesh service of peers, called from line %ld\n",
+              line);
+  disconnect_task = GNUNET_SCHEDULER_NO_TASK;
+  for (i = 0; i < 2; i++)
+  {
+    GNUNET_TESTBED_operation_done (t_op[i]);
+  }
+  if (NULL != ch)
+  {
+    GNUNET_MESH_channel_destroy (ch);
+    ch = NULL;
+  }
+  if (NULL != incoming_ch)
+  {
+    GNUNET_MESH_channel_destroy (incoming_ch);
+    incoming_ch = NULL;
+  }
+  GNUNET_MESH_TEST_cleanup (test_ctx);
+  if (GNUNET_SCHEDULER_NO_TASK != shutdown_handle)
+  {
+    GNUNET_SCHEDULER_cancel (shutdown_handle);
+  }
+  shutdown_handle = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
 }
 
 
 /**
- * Method called whenever a tunnel is established.
+ * Abort test: schedule disconnect and shutdown immediately
  *
- * @param cls closure
- * @param peer peer identity the tunnel was created to, NULL on timeout
- * @param atsi performance data for the connection
+ * @param line Line in the code the abort is requested from (__LINE__).
  */
 static void
-ch (void *cls, const struct GNUNET_PeerIdentity *peer,
-    const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+abort_test (long line)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "peer connected\n");
-  return;
+  if (disconnect_task != GNUNET_SCHEDULER_NO_TASK)
+  {
+    GNUNET_SCHEDULER_cancel (disconnect_task);
+    disconnect_task = GNUNET_SCHEDULER_add_now (&disconnect_mesh_peers,
+                                                (void *) line);
+  }
 }
 
+/**
+ * Transmit ready callback.
+ *
+ * @param cls Closure (message type).
+ * @param size Size of the tranmist buffer.
+ * @param buf Pointer to the beginning of the buffer.
+ *
+ * @return Number of bytes written to buf.
+ */
+static size_t
+tmt_rdy (void *cls, size_t size, void *buf);
+
 
 /**
- * connect_mesh_service: connect to the mesh service of one of the peers
+ * Task to schedule a new data transmission.
  *
+ * @param cls Closure (peer #).
+ * @param tc Task Context.
  */
 static void
-connect_mesh_service (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+data_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  struct GNUNET_TESTING_Daemon *d;
-  struct GNUNET_MESH_Handle *h;
-  struct GNUNET_MESH_Tunnel *t;
-  GNUNET_MESH_ApplicationType app;
+  struct GNUNET_MESH_TransmitHandle *th;
+  struct GNUNET_MESH_Channel *channel;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "connect_mesh_service\n");
+  if ((GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason) != 0)
+    return;
 
-  d = GNUNET_TESTING_daemon_get (pg, 1);
-  app = (GNUNET_MESH_ApplicationType) 0;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Data task\n");
+  if (GNUNET_YES == test_backwards)
+  {
+    channel = incoming_ch;
+  }
+  else
+  {
+    channel = ch;
+  }
+  th = GNUNET_MESH_notify_transmit_ready (channel, GNUNET_NO,
+                                          GNUNET_TIME_UNIT_FOREVER_REL,
+                                          size_payload, &tmt_rdy, (void *) 1L);
+  if (NULL == th)
+  {
+    unsigned long i = (unsigned long) cls;
 
-#if VERBOSE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "connecting to mesh service of peer %s\n", GNUNET_i2s (&d->id));
-#endif
-  h = GNUNET_MESH_connect (d->cfg, 10, NULL, &tunnel_cleaner, handlers, &app);
-#if VERBOSE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "connected to mesh service of peer %s\n",
-              GNUNET_i2s (&d->id));
-#endif
-  t = GNUNET_MESH_tunnel_create (h, &ch, &dh, NULL);
-  GNUNET_MESH_tunnel_destroy (t);
-  GNUNET_MESH_disconnect (h);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Retransmission\n");
+    if (0 == i)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "  in 1 ms\n");
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MILLISECONDS,
+                                    &data_task, (void *)1UL);
+    }
+    else
+    {
+      i++;
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "in %u ms\n", i);
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(
+                                      GNUNET_TIME_UNIT_MILLISECONDS,
+                                      i),
+                                    &data_task, (void *)i);
+    }
+  }
 }
 
 
-static void
-churn_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-
-
 /**
- * Continuation called by the "get_all" and "get" functions.
+ * Transmit ready callback
  *
- * @param cls struct StatsContext
- * @param success GNUNET_OK if statistics were
- *        successfully obtained, GNUNET_SYSERR if not.
+ * @param cls Closure (message type).
+ * @param size Size of the buffer we have.
+ * @param buf Buffer to copy data to.
  */
-static void
-stats_finished_callback (void *cls, int success)
+size_t
+tmt_rdy (void *cls, size_t size, void *buf)
 {
-  struct StatsContext *stats_context = cls;
-  char *buf;
-  int buf_len;
-
-  if ((GNUNET_OK == success) && (data_file != NULL))
-  {
-    /* Stats lookup successful, write out data */
-    buf = NULL;
-    buf_len =
-        GNUNET_asprintf (&buf, "TOTAL_MESH_BYTES: %u\n",
-                         stats_context->total_mesh_bytes);
-    if (buf_len > 0)
+  struct GNUNET_MessageHeader *msg = buf;
+  uint32_t *data;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "tmt_rdy called, filling buffer\n");
+  if (size < size_payload || NULL == buf)
+  {
+    GNUNET_break (ok >= ok_goal - 2);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "size %u, buf %p, data_sent %u, data_received %u\n",
+                size,
+                buf,
+                data_sent,
+                data_received);
+    return 0;
+  }
+  msg->size = htons (size);
+  msg->type = htons ((long) cls);
+  data = (uint32_t *) &msg[1];
+  *data = htonl (data_sent);
+  if (GNUNET_NO == initialized)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "sending initializer\n");
+  }
+  else if (SPEED == test)
+  {
+    data_sent++;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              " Sent packet %d\n", data_sent);
+    if (data_sent < TOTAL_PACKETS)
     {
-      GNUNET_DISK_file_write (data_file, buf, buf_len);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              " Scheduling packet %d\n", data_sent + 1);
+      GNUNET_SCHEDULER_add_now (&data_task, NULL);
     }
-    GNUNET_free_non_null (buf);
   }
 
-  GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == shutdown_handle);
-  shutdown_handle = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
-  GNUNET_free (stats_context);
+  return size_payload;
 }
 
 
 /**
- * Callback function to process statistic values.
+ * Function is called whenever a message is received.
  *
- * @param cls struct StatsContext
- * @param peer the peer the statistics 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
-statistics_iterator (void *cls, const struct GNUNET_PeerIdentity *peer,
-                     const char *subsystem, const char *name, uint64_t value,
-                     int is_persistent)
+ * @param cls closure (set from GNUNET_MESH_connect)
+ * @param channel connection to the other end
+ * @param channel_ctx place to store local state associated with the channel
+ * @param message the actual message
+ * @return GNUNET_OK to keep the connection open,
+ *         GNUNET_SYSERR to close it (signal serious error)
+ */
+int
+data_callback (void *cls, struct GNUNET_MESH_Channel *channel,
+               void **channel_ctx,
+               const struct GNUNET_MessageHeader *message)
 {
-  struct StatsContext *stats_context = cls;
+  long client = (long) cls;
+  long expected_target_client;
+  uint32_t *data;
 
-//
-//   if ( (0 == strstr(subsystem, "nse")) &&
-//        (0 == strstr(name, "# flood messages received")) )
-  stats_context->total_mesh_bytes += 1; //value;
-  return GNUNET_OK;
-}
+  ok++;
 
+  GNUNET_MESH_receive_done (channel);
 
-static void
-disconnect_mesh_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-//   struct NSEPeer *pos;
-  char *buf;
-  struct StatsContext *stats_context;
+  if ((ok % 20) == 0)
+  {
+    if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
+    {
+      GNUNET_SCHEDULER_cancel (disconnect_task);
+      disconnect_task = GNUNET_SCHEDULER_add_delayed (SHORT_TIME,
+                                                      &disconnect_mesh_peers,
+                                                      (void *) __LINE__);
+    }
+  }
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "disconnecting mesh service of peers\n");
-  disconnect_task = GNUNET_SCHEDULER_NO_TASK;
-//   pos = peer_head;
-//   while (NULL != (pos = peer_head))
-//     {
-//       if (pos->nse_handle != NULL)
-//         {
-//           GNUNET_NSE_disconnect(pos->nse_handle);
-//           pos->nse_handle = NULL;
-//         }
-//       GNUNET_CONTAINER_DLL_remove(peer_head, peer_tail, pos);
-//       GNUNET_free(pos);
-//     }
-
-  GNUNET_asprintf (&buf, "round%llu", current_round);
-  if (GNUNET_OK ==
-      GNUNET_CONFIGURATION_get_value_number (testing_cfg, "test_mesh_small",
-                                             buf, &peers_next_round))
-  {
-    current_round++;
-    GNUNET_assert (churn_task == GNUNET_SCHEDULER_NO_TASK);
-    churn_task = GNUNET_SCHEDULER_add_now (&churn_peers, NULL);
+  switch (client)
+  {
+  case 0L:
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Root client got a message!\n");
+    break;
+  case 4L:
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Leaf client %li got a message.\n",
+                client);
+    break;
+  default:
+    GNUNET_assert (0);
+    break;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: (%d/%d)\n", ok, ok_goal);
+  data = (uint32_t *) &message[1];
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, " payload: (%u)\n", ntohl (*data));
+  if (SPEED == test && GNUNET_YES == test_backwards)
+  {
+    expected_target_client = 0L;
   }
   else
-  {                             /* No more rounds, let's shut it down! */
+  {
+    expected_target_client = 4L;
+  }
 
-    stats_context = GNUNET_malloc (sizeof (struct StatsContext));
-    GNUNET_SCHEDULER_cancel (shutdown_handle);
-    shutdown_handle = GNUNET_SCHEDULER_NO_TASK;
-    GNUNET_TESTING_get_statistics (pg, &stats_finished_callback,
-                                   &statistics_iterator, stats_context);
+  if (GNUNET_NO == initialized)
+  {
+    initialized = GNUNET_YES;
+    start_time = GNUNET_TIME_absolute_get ();
+    if (SPEED == test)
+    {
+      GNUNET_assert (4L == client);
+      GNUNET_SCHEDULER_add_now (&data_task, NULL);
+      return GNUNET_OK;
+    }
   }
-  GNUNET_free (buf);
+
+  if (client == expected_target_client) // Normally 4
+  {
+    data_received++;
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                " received data %u\n", data_received);
+    if (SPEED != test || (ok_goal - 2) == ok)
+    {
+      GNUNET_MESH_notify_transmit_ready (channel, GNUNET_NO,
+                                         GNUNET_TIME_UNIT_FOREVER_REL,
+                                         size_payload, &tmt_rdy, (void *) 1L);
+      return GNUNET_OK;
+    }
+    else
+    {
+      if (data_received < TOTAL_PACKETS)
+        return GNUNET_OK;
+    }
+  }
+  else // Normally 0
+  {
+    if (test == SPEED_ACK || test == SPEED)
+    {
+      data_ack++;
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              " received ack %u\n", data_ack);
+      GNUNET_MESH_notify_transmit_ready (channel, GNUNET_NO,
+                                         GNUNET_TIME_UNIT_FOREVER_REL,
+                                         size_payload, &tmt_rdy, (void *) 1L);
+      if (data_ack < TOTAL_PACKETS && SPEED != test)
+        return GNUNET_OK;
+      if (ok == 2 && SPEED == test)
+        return GNUNET_OK;
+      show_end_data();
+    }
+    if (test == P2P_SIGNAL)
+    {
+      GNUNET_MESH_channel_destroy (incoming_ch);
+      incoming_ch = NULL;
+    }
+    else
+    {
+      GNUNET_MESH_channel_destroy (ch);
+      ch = NULL;
+    }
+  }
+
+  if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
+  {
+    GNUNET_SCHEDULER_cancel (disconnect_task);
+    disconnect_task = GNUNET_SCHEDULER_add_delayed (SHORT_TIME,
+                                                    &disconnect_mesh_peers,
+                                                    (void *) __LINE__);
+  }
+
+  return GNUNET_OK;
 }
 
 
 /**
- * FIXME.
- *
- * @param cls unused
- * @param emsg NULL on success
+ * Handlers, for diverse services
  */
-static void
-topology_output_callback (void *cls, const char *emsg)
-{
-  disconnect_task =
-      GNUNET_SCHEDULER_add_delayed (wait_time, &disconnect_mesh_peers, NULL);
-  GNUNET_SCHEDULER_add_now (&connect_mesh_service, NULL);
-}
+static struct GNUNET_MESH_MessageHandler handlers[] = {
+  {&data_callback, 1, sizeof (struct GNUNET_MessageHeader)},
+  {NULL, 0, 0}
+};
 
 
 /**
- * FIXME.
+ * Method called whenever another peer has added us to a channel
+ * the other peer initiated.
  *
- * @param cls closure
- * @param emsg NULL on success
+ * @param cls Closure.
+ * @param channel New handle to the channel.
+ * @param initiator Peer that started the channel.
+ * @param port Port this channel is connected to.
+ * @param options channel option flags
+ * @return Initial channel context for the channel
+ *         (can be NULL -- that's not an error).
  */
-static void
-churn_callback (void *cls, const char *emsg)
+static void *
+incoming_channel (void *cls, struct GNUNET_MESH_Channel *channel,
+                 const struct GNUNET_PeerIdentity *initiator,
+                 uint32_t port, enum GNUNET_MESH_ChannelOption options)
 {
-  char *temp_output_file;
-
-  if (emsg == NULL)
-  {                             /* Everything is okay! */
-    peers_running = peers_next_round;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Incoming channel from %s to peer %d\n",
+              GNUNET_i2s (initiator), (long) cls);
+  ok++;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok);
+  if ((long) cls == 4L)
+    incoming_ch = channel;
+  else
+  {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Round %llu, churn finished successfully.\n", current_round);
-    GNUNET_assert (disconnect_task == GNUNET_SCHEDULER_NO_TASK);
-    GNUNET_asprintf (&temp_output_file, "%s_%llu.dot", topology_file,
-                     current_round);
-    GNUNET_TESTING_peergroup_topology_to_file (pg, temp_output_file,
-                                               &topology_output_callback, NULL);
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Writing topology to file %s\n",
-                temp_output_file);
-    GNUNET_free (temp_output_file);
+                "Incoming channel for unknown client %lu\n", (long) cls);
+    GNUNET_break(0);
   }
-  else
+  if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Round %llu, churn FAILED!!\n",
-                current_round);
-    GNUNET_SCHEDULER_cancel (shutdown_handle);
-    shutdown_handle = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+    GNUNET_SCHEDULER_cancel (disconnect_task);
+    disconnect_task = GNUNET_SCHEDULER_add_delayed (SHORT_TIME,
+                                                    &disconnect_mesh_peers,
+                                                    (void *) __LINE__);
   }
-}
 
+  return NULL;
+}
 
+/**
+ * Function called whenever an inbound channel is destroyed.  Should clean up
+ * any associated state.
+ *
+ * @param cls closure (set from GNUNET_MESH_connect)
+ * @param channel connection to the other end (henceforth invalid)
+ * @param channel_ctx place where local state associated
+ *                   with the channel is stored
+ */
 static void
-churn_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+channel_cleaner (void *cls, const struct GNUNET_MESH_Channel *channel,
+                 void *channel_ctx)
 {
-  /* peers_running = GNUNET_TESTING_daemons_running(pg); */
-  churn_task = GNUNET_SCHEDULER_NO_TASK;
-  if (peers_next_round == peers_running)
-  {
-    /* Nothing to do... */
-    GNUNET_SCHEDULER_add_now (&connect_mesh_service, NULL);
-    GNUNET_assert (disconnect_task == GNUNET_SCHEDULER_NO_TASK);
-    disconnect_task =
-        GNUNET_SCHEDULER_add_delayed (wait_time, &disconnect_mesh_peers, NULL);
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Round %lu, doing nothing!\n",
-                current_round);
+  long i = (long) cls;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Incoming channel disconnected at peer %d\n",
+              i);
+  if (4L == i)
+  {
+    ok++;
+    GNUNET_break (channel == incoming_ch);
+    incoming_ch = NULL;
   }
-  else
+  else if (0L == i)
   {
-    if (peers_next_round > num_peers)
+    if (P2P_SIGNAL == test)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Asked to turn on more peers than we have!!\n");
-      GNUNET_SCHEDULER_cancel (shutdown_handle);
-      GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+      ok ++;
     }
+    GNUNET_break (channel == ch);
+    ch = NULL;
+  }
+  else
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Round %llu, turning off %llu peers, turning on %llu peers!\n",
-                current_round,
-                (peers_running >
-                 peers_next_round) ? peers_running - peers_next_round : 0,
-                (peers_next_round >
-                 peers_running) ? peers_next_round - peers_running : 0);
-    GNUNET_TESTING_daemons_churn (pg, "nse",
-                                  (peers_running >
-                                   peers_next_round) ? peers_running -
-                                  peers_next_round : 0,
-                                  (peers_next_round >
-                                   peers_running) ? peers_next_round -
-                                  peers_running : 0, wait_time, &churn_callback,
-                                  NULL);
+                "Unknown peer! %d\n", i);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, " ok: %d\n", ok);
+
+  if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
+  {
+    GNUNET_SCHEDULER_cancel (disconnect_task);
+    disconnect_task = GNUNET_SCHEDULER_add_now (&disconnect_mesh_peers,
+                                                (void *) __LINE__);
   }
+
+  return;
 }
 
 
 /**
- * peergroup_ready: start test when all peers are connected
- * @param cls closure
- * @param emsg error message
+ * START THE TESTCASE ITSELF, AS WE ARE CONNECTED TO THE MESH SERVICES.
+ *
+ * Testcase continues when the root receives confirmation of connected peers,
+ * on callback funtion ch.
+ *
+ * @param cls Closure (unsued).
+ * @param tc Task Context.
  */
 static void
-peergroup_ready (void *cls, const char *emsg)
+do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  char *buf;
-  int buf_len;
+  enum GNUNET_MESH_ChannelOption flags;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test_task\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "add peer 2\n");
 
-  if (emsg != NULL)
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "schedule timeout in TIMEOUT\n");
+  if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Peergroup callback called with error, aborting test!\n");
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Error from testing: `%s'\n");
-    ok = 1;
-    GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
-    return;
+    GNUNET_SCHEDULER_cancel (disconnect_task);
   }
-#if VERBOSE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer Group started successfully!\n");
-#endif
 
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Have %u connections\n",
-              total_connections);
-  if (data_file != NULL)
+  flags = GNUNET_MESH_OPTION_DEFAULT;
+  if (SPEED_REL == test)
   {
-    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);
+    test = SPEED;
+    flags |= GNUNET_MESH_OPTION_RELIABLE;
   }
-  peers_running = GNUNET_TESTING_daemons_running (pg);
-
-  GNUNET_SCHEDULER_add_now (&connect_mesh_service, NULL);
-  disconnect_task =
-      GNUNET_SCHEDULER_add_delayed (wait_time, &disconnect_mesh_peers, NULL);
+  ch = GNUNET_MESH_channel_create (h1, NULL, p_id[1], 1, flags);
 
+  disconnect_task = GNUNET_SCHEDULER_add_delayed (SHORT_TIME,
+                                                  &disconnect_mesh_peers,
+                                                  (void *) __LINE__);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Sending data initializer...\n");
+  data_ack = 0;
+  data_received = 0;
+  data_sent = 0;
+  GNUNET_MESH_notify_transmit_ready (ch, GNUNET_NO,
+                                     GNUNET_TIME_UNIT_FOREVER_REL,
+                                     size_payload, &tmt_rdy, (void *) 1L);
 }
 
+/**
+ * Callback to be called when the requested peer information is available
+ *
+ * @param cls the closure from GNUNET_TESTBED_peer_get_information()
+ * @param op the operation this callback corresponds to
+ * @param pinfo the result; will be NULL if the operation has failed
+ * @param emsg error message if the operation has failed;
+ *             NULL if the operation is successfull
+ */
+static void
+pi_cb (void *cls,
+       struct GNUNET_TESTBED_Operation *op,
+       const struct GNUNET_TESTBED_PeerInformation *pinfo,
+       const char *emsg)
+{
+  long i = (long) cls;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "id callback for %ld\n", i);
+
+  if (NULL == pinfo || NULL != emsg)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "pi_cb: %s\n", emsg);
+    abort_test (__LINE__);
+    return;
+  }
+  p_id[i] = pinfo->result.id;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "  id: %s\n", GNUNET_i2s (p_id[i]));
+  p_ids++;
+  if (p_ids < 2)
+    return;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got all IDs, starting test\n");
+  test_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                                            &do_test, NULL);
+}
 
 /**
- * Function that will be called whenever two daemons are connected by
- * the testing library.
+ * test main: start test when all peers are 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 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)
+ * @param cls Closure.
+ * @param ctx Argument to give to GNUNET_MESH_TEST_cleanup on test end.
+ * @param num_peers Number of peers that are running.
+ * @param peers Array of peers.
+ * @param meshes Handle to each of the MESHs of the peers.
  */
 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)
+tmain (void *cls,
+       struct GNUNET_MESH_TEST_Context *ctx,
+       unsigned int num_peers,
+       struct GNUNET_TESTBED_Peer **peers,
+       struct GNUNET_MESH_Handle **meshes)
 {
-  if (emsg == NULL)
-    total_connections++;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test main\n");
+  ok = 0;
+  test_ctx = ctx;
+  peers_running = num_peers;
+  h1 = meshes[0];
+  h2 = meshes[num_peers - 1];
+  disconnect_task = GNUNET_SCHEDULER_add_delayed (SHORT_TIME,
+                                                  &disconnect_mesh_peers,
+                                                  (void *) __LINE__);
+  shutdown_handle = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+                                                  &shutdown_task, NULL);
+  t_op[0] = GNUNET_TESTBED_peer_get_information (peers[0],
+                                                 GNUNET_TESTBED_PIT_IDENTITY,
+                                                 &pi_cb, (void *) 0L);
+  t_op[1] = GNUNET_TESTBED_peer_get_information (peers[num_peers - 1],
+                                                 GNUNET_TESTBED_PIT_IDENTITY,
+                                                 &pi_cb, (void *) 1L);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "requested peer ids\n");
 }
 
 
 /**
- * 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
+ * Main: start test
  */
-static void
-run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+int
+main (int argc, char *argv[])
 {
-  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",
-#if VERBOSE
-                    "DEBUG",
-#else
-                    "WARNING",
-#endif
-                    NULL);
-
-#if VERBOSE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "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_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;
-    }
-  }
+  initialized = GNUNET_NO;
+  uint32_t ports[2];
+  const char *config_file;
+
+  GNUNET_log_setup ("test", "DEBUG", NULL);
+  config_file = "test_mesh.conf";
 
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (testing_cfg, "test_mesh_small",
-                                             "wait_time", &temp_wait))
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Start\n");
+  if (strstr (argv[0], "_small_forward") != NULL)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Option nsetest_mesh_small:wait_time is required!\n");
-    return;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "FORWARD\n");
+    test = FORWARD;
+    test_name = "unicast";
+    ok_goal = 4;
   }
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (testing_cfg, "testing",
-                                             "topology_output_file",
-                                             &topology_file))
+  else if (strstr (argv[0], "_small_signal") != NULL)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Option test_mesh_small:topology_output_file is required!\n");
-    return;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SIGNAL\n");
+    test = P2P_SIGNAL;
+    test_name = "signal";
+    ok_goal = 4;
   }
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (testing_cfg, "test_mesh_small",
-                                             "data_output_file",
-                                             &data_filename))
+  else if (strstr (argv[0], "_small_speed_ack") != NULL)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Option test_mesh_small:data_output_file is required!\n");
-    return;
+   /* Each peer is supposed to generate the following callbacks:
+    * 1 incoming channel (@dest)
+    * TOTAL_PACKETS received data packet (@dest)
+    * TOTAL_PACKETS received data packet (@orig)
+    * 1 received channel destroy (@dest)
+    * _________________________________
+    * 5 x ok expected per peer
+    */
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SPEED_ACK\n");
+    test = SPEED_ACK;
+    test_name = "speed ack";
+    ok_goal = TOTAL_PACKETS * 2 + 2;
   }
-
-  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)
+  else if (strstr (argv[0], "_small_speed") != NULL)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Failed to open %s for output!\n",
-                data_filename);
-    GNUNET_free (data_filename);
+   /* Each peer is supposed to generate the following callbacks:
+    * 1 incoming channel (@dest)
+    * 1 initial packet (@dest)
+    * TOTAL_PACKETS received data packet (@dest)
+    * 1 received data packet (@orig)
+    * 1 received channel destroy (@dest)
+    * _________________________________
+    */
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "SPEED\n");
+    ok_goal = TOTAL_PACKETS + 4;
+    if (strstr (argv[0], "_reliable") != NULL)
+    {
+      test = SPEED_REL;
+      test_name = "speed reliable";
+      config_file = "test_mesh_drop.conf";
+    }
+    else
+    {
+      test = SPEED;
+      test_name = "speed";
+    }
   }
-
-  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))
+  else
   {
-    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_log (GNUNET_ERROR_TYPE_DEBUG, "UNKNOWN\n");
+    test = SETUP;
+    ok_goal = 0;
   }
-  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);
-}
-
 
+  if (strstr (argv[0], "backwards") != NULL)
+  {
+    char *aux;
 
-/**
- * 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
-};
-
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "BACKWARDS (LEAF TO ROOT)\n");
+    test_backwards = GNUNET_YES;
+    aux = GNUNET_malloc (32);
+    sprintf (aux, "backwards %s", test_name);
+    test_name = aux;
+  }
 
-/**
- * Main: start test
- */
-int
-main (int argc, char *argv[])
-{
-  GNUNET_PROGRAM_run (argc, argv, "test_mesh_small",
-                      gettext_noop ("Test mesh in a small network."), options,
-                      &run, NULL);
-#if REMOVE_DIR
-  GNUNET_DISK_directory_remove ("/tmp/test_mesh_small");
-#endif
-  return ok;
+  p_ids = 0;
+  ports[0] = 1;
+  ports[1] = 0;
+  GNUNET_MESH_TEST_run ("test_mesh_small",
+                        config_file,
+                        5,
+                        &tmain,
+                        NULL, /* tmain cls */
+                        &incoming_channel,
+                        &channel_cleaner,
+                        handlers,
+                        ports);
+
+  if (ok_goal > ok)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "FAILED! (%d/%d)\n", ok, ok_goal);
+    return 1;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "success\n");
+  return 0;
 }
 
 /* end of test_mesh_small.c */
+