-fix (C) notices
[oweals/gnunet.git] / src / transport / test_quota_compliance.c
index 0f552cbb006edb20d1563ff8be846a3397a4e395..ad1ecbe7afeb010576c0613576c016f5742e0db7 100644 (file)
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009, 2010, 2011 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
 
      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.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file transport/test_quota_compliance.c
  * @brief base test case for transport implementations
  *
- * This test case tests quota compliance both on core and transport level
+ * This test case tests quota compliance both on transport level
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_server_lib.h"
 #include "gnunet_transport_service.h"
-#include "transport.h"
+#include "gnunet_ats_service.h"
+#include "gauger.h"
+#include "transport-testing.h"
 
-#define VERBOSE GNUNET_NO
+/**
+ * Testcase timeout
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
 
-#define VERBOSE_ARM GNUNET_NO
+/**
+ * How long until we give up on transmitting the message?
+ */
+#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20)
 
-#define START_ARM GNUNET_YES
-#define DEBUG_MEASUREMENT GNUNET_NO
-#define DEBUG_CONNECTIONS GNUNET_NO
+#define DURATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
 
-#define MEASUREMENT_INTERVALL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
-#define MEASUREMENT_MSG_SIZE 1024
-#define MEASUREMENT_MSG_SIZE_BIG 32768
-#define MEASUREMENT_MAX_QUOTA 1024 * 1024 * 1024
-#define MEASUREMENT_MIN_QUOTA 1024
-#define SEND_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
-#define MEASUREMENT_SOFT_LIMIT 1024
+static char *test_source;
 
-/**
- * Testcase timeout
- */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 200)
+static char *test_plugin;
 
+static char *test_name;
 
+static struct GNUNET_SCHEDULER_Task * die_task;
 
-#define MTYPE 11111
+static struct GNUNET_SCHEDULER_Task * measure_task;
 
-struct PeerContext
-{
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-  struct GNUNET_TRANSPORT_Handle *th;
-  struct GNUNET_PeerIdentity id;
-#if START_ARM
-  struct GNUNET_OS_Process *arm_proc;
-#endif
-};
+struct PeerContext *p1;
+
+struct PeerContext *p2;
+
+struct PeerContext *sender;
+
+struct PeerContext *receiver;
+
+struct GNUNET_TRANSPORT_TransmitHandle *th;
+
+char *cfg_file_p1;
+char *gen_cfg_p2;
+unsigned long long quota_in_p1;
+unsigned long long quota_out_p1;
+
+char *cfg_file_p2;
+char *gen_cfg_p1;
+unsigned long long quota_in_p2;
+unsigned long long quota_out_p2;
+
+struct GNUNET_TRANSPORT_TESTING_handle *tth;
+
+static struct GNUNET_TRANSPORT_TESTING_ConnectRequest * cc;
+
+
+/*
+ * Testcase specific declarations
+ */
 
 /**
- * Handle for a transmission-ready request.
+ * Note that this value must not significantly exceed
+ * 'MAX_PENDING' in 'gnunet-service-transport.c', otherwise
+ * messages may be dropped even for a reliable transport.
  */
-struct GNUNET_TRANSPORT_TransmitHandle
-{
+#define TOTAL_MSGS (1024 * 2)
 
-  /**
-   * Neighbour for this handle, NULL for control-traffic.
-   */
-  struct NeighbourList *neighbour;
-
-  /**
-   * Function to call when notify_size bytes are available
-   * for transmission.
-   */
-  GNUNET_CONNECTION_TransmitReadyNotify notify;
-
-  /**
-   * Closure for notify.
-   */
-  void *notify_cls;
-
-  /**
-   * transmit_ready task Id.  The task is used to introduce the
-   * artificial delay that may be required to maintain the bandwidth
-   * limits.  Later, this will be the ID of the "transmit_timeout"
-   * task which is used to signal a timeout if the transmission could
-   * not be done in a timely fashion.
-   */
-  GNUNET_SCHEDULER_TaskIdentifier notify_delay_task;
-
-  /**
-   * Timeout for this request.
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * How many bytes is our notify callback waiting for?
-   */
-  size_t notify_size;
-
-  /**
-   * How important is this message?
-   */
-  unsigned int priority;
+#define MTYPE 12345
 
+GNUNET_NETWORK_STRUCT_BEGIN
+struct TestMessage
+{
+  struct GNUNET_MessageHeader header;
+  uint32_t num;
 };
+GNUNET_NETWORK_STRUCT_END
 
-static struct PeerContext p1;
-
-static struct PeerContext p2;
+static int msg_scheduled;
+static int msg_sent;
 
-static int ok;
-
-static int connected;
-static int measurement_running;
-static int send_running;
-static int recv_running;
+static int test_failed;
+static int test_connected;
 
 static unsigned long long total_bytes_sent;
-static unsigned long long last_msg_sent;
-static unsigned long long last_msg_recv;
-static unsigned long long current_quota_p1;
-static unsigned long long current_quota_p2;
-
-static int is_tcp;
-static int is_tcp_nat;
-static int is_http;
-static int is_https;
-static int is_udp;
-static int is_asymmetric_send_constant;
-static int is_asymmetric_recv_constant;
 
 static struct GNUNET_TIME_Absolute start_time;
 
-static GNUNET_SCHEDULER_TaskIdentifier die_task;
-static GNUNET_SCHEDULER_TaskIdentifier measurement_task;
-static GNUNET_SCHEDULER_TaskIdentifier measurement_counter_task;
-
-struct GNUNET_TRANSPORT_TransmitHandle * transmit_handle;
+/*
+ * END Testcase specific declarations
+ */
 
+#if VERBOSE
+#define OKPP do { ok++; FPRINTF (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
+#else
 #define OKPP do { ok++; } while (0)
-
+#endif
 
 
 static void
-end_send ()
+end ()
 {
+  unsigned long long delta;
+  unsigned long long datarate;
 
-}
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
 
-static void
-end ()
-{
-  GNUNET_SCHEDULER_cancel (die_task);
-  die_task = GNUNET_SCHEDULER_NO_TASK;
+  delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value_us;
+  datarate = (total_bytes_sent * 1000 * 1000) / delta;
+
+  FPRINTF (stderr, "Throughput was %llu b/s\n", datarate);
 
-  if (measurement_task != GNUNET_SCHEDULER_NO_TASK)
+  test_failed = GNUNET_NO;
+  if (datarate > quota_in_p2)
   {
-           GNUNET_SCHEDULER_cancel (measurement_task);
-           measurement_task = GNUNET_SCHEDULER_NO_TASK;
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Datarate of %llu b/s higher than allowed inbound quota of %llu b/s\n",
+                datarate, quota_in_p2);
+    test_failed = GNUNET_YES;
   }
-  if (measurement_counter_task != GNUNET_SCHEDULER_NO_TASK)
+  if (datarate > quota_out_p1)
   {
-           GNUNET_SCHEDULER_cancel (measurement_counter_task);
-           measurement_counter_task = GNUNET_SCHEDULER_NO_TASK;
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Datarate of %llu b/s higher than allowed outbound quota of %llu b/s\n",
+                datarate, quota_out_p1);
+    test_failed = GNUNET_YES;
+  }
+  if (test_failed == GNUNET_NO)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Datarate of %llu b/s complied to allowed outbound quota of %llu b/s and inbound quota of %llu b/s\n",
+                datarate, quota_out_p1, quota_in_p2);
   }
-  GNUNET_SCHEDULER_shutdown ();
-#if DEBUG_CONNECTIONS
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n");
-#endif
-  GNUNET_TRANSPORT_disconnect (p1.th);
-  GNUNET_TRANSPORT_disconnect (p2.th);
-#if DEBUG_CONNECTIONS
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Transports disconnected, returning success!\n");
-#endif
-  GNUNET_SCHEDULER_shutdown ();
-}
 
+  if (die_task != NULL)
+    GNUNET_SCHEDULER_cancel (die_task);
 
+  if (th != NULL)
+    GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
+  th = NULL;
 
-static void
-stop_arm (struct PeerContext *p)
-{
-#if START_ARM
-  if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  GNUNET_OS_process_wait (p->arm_proc);
-  GNUNET_OS_process_close (p->arm_proc);
-  p->arm_proc = NULL;
-#endif
-  GNUNET_CONFIGURATION_destroy (p->cfg);
-}
+  if (cc != NULL)
+    GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc);
 
+  GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
+  GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
+
+}
 
 static void
-end_badly (void *cls,
-          const struct GNUNET_SCHEDULER_TaskContext *tc)
+end_badly ()
 {
-  if (measurement_task != GNUNET_SCHEDULER_NO_TASK)
-  {
-           GNUNET_SCHEDULER_cancel (measurement_task);
-           measurement_task = GNUNET_SCHEDULER_NO_TASK;
-  }
-  if (measurement_counter_task != GNUNET_SCHEDULER_NO_TASK)
-  {
-           GNUNET_SCHEDULER_cancel (measurement_counter_task);
-           measurement_counter_task = GNUNET_SCHEDULER_NO_TASK;
-  }
-  GNUNET_break (0);
-  if (p1.th != NULL)
-         GNUNET_TRANSPORT_disconnect (p1.th);
-  if (p2.th != NULL)
-         GNUNET_TRANSPORT_disconnect (p2.th);
-  ok = 1;
+  die_task = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
+
+  if (measure_task != NULL)
+    GNUNET_SCHEDULER_cancel (measure_task);
+
+  if (test_connected == GNUNET_YES)
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers got connected\n");
+  else
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers got NOT connected\n");
+
+  if (th != NULL)
+    GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
+  th = NULL;
+
+  if (cc != NULL)
+    GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc);
+
+  if (p1 != NULL)
+    GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
+  if (p2 != NULL)
+    GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
+
+  test_failed = GNUNET_YES;
 }
 
-struct TestMessage
-{
-  struct GNUNET_MessageHeader header;
-  uint32_t num;
-};
 
 static unsigned int
-get_size (void)
+get_size (unsigned int iter)
 {
-  return MEASUREMENT_MSG_SIZE + sizeof (struct TestMessage);
+  unsigned int ret;
+
+  ret = (iter * iter * iter);
+  return sizeof (struct TestMessage) + (ret % 60000);
 }
 
+
 static void
-notify_receive_new (void *cls,
+notify_receive (void *cls,
                 const struct GNUNET_PeerIdentity *peer,
-                const struct GNUNET_MessageHeader *message,
-                struct GNUNET_TIME_Relative latency,
-               uint32_t distance)
+                const struct GNUNET_MessageHeader *message)
 {
-  unsigned int s;
   const struct TestMessage *hdr;
+  struct PeerContext *p = cls;
 
-  hdr = (const struct TestMessage*) message;
-  s = get_size ();
-  if (measurement_running == GNUNET_NO)
-         return;
+  hdr = (const struct TestMessage *) message;
   if (MTYPE != ntohs (message->type))
     return;
 
-#if DEBUG_MEASUREMENT
-  if (ntohl(hdr->num) % 5000 == 0)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Got message %u of size %u\n",
-                  ntohl (hdr->num),
-                  ntohs (message->size));
-    }
-#endif
-  /*
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Got message %u\n",
-              ntohl (hdr->num));*/
-  last_msg_recv = ntohl (hdr->num);
+  {
+    char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
+
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Peer %u (`%s') got message %u of size %u from peer (`%s')\n",
+                p->no,
+                ps,
+                ntohl (hdr->num),
+                ntohs (message->size),
+                GNUNET_i2s (peer));
+    GNUNET_free (ps);
+  }
 }
 
+
 static size_t
 notify_ready (void *cls, size_t size, void *buf)
 {
+  static int n;
   char *cbuf = buf;
   struct TestMessage hdr;
   unsigned int s;
   unsigned int ret;
 
-  transmit_handle = NULL;
-
-  if (measurement_task == GNUNET_SCHEDULER_NO_TASK)
-         return 0;
-
+  th = NULL;
   if (buf == NULL)
-    {
-      ok = 42;
-      return 0;
-    }
-
-  if (measurement_running != GNUNET_YES)
   {
-         send_running = GNUNET_NO;
-         end_send();
-         return 0;
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Timeout occurred while waiting for transmit_ready for message %u of %u\n",
+                msg_scheduled, TOTAL_MSGS);
+    if (NULL != die_task)
+      GNUNET_SCHEDULER_cancel (die_task);
+    die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+    test_failed = 1;
+    return 0;
   }
 
-  send_running = GNUNET_YES;
   ret = 0;
-  s = get_size ();
+  s = get_size (n);
   GNUNET_assert (size >= s);
   GNUNET_assert (buf != NULL);
-  last_msg_sent++;
   cbuf = buf;
   do
+  {
+    hdr.header.size = htons (s);
+    hdr.header.type = htons (MTYPE);
+    hdr.num = htonl (n);
+    msg_sent = n;
+    memcpy (&cbuf[ret], &hdr, sizeof (struct TestMessage));
+    ret += sizeof (struct TestMessage);
+    memset (&cbuf[ret], n, s - sizeof (struct TestMessage));
+    ret += s - sizeof (struct TestMessage);
+#if VERBOSE
+    if (n % 5000 == 0)
     {
-      hdr.header.size = htons (s);
-      hdr.header.type = htons (MTYPE);
-      hdr.num = htonl (last_msg_sent);
-      memcpy (&cbuf[ret], &hdr, sizeof (struct TestMessage));
-      ret += sizeof (struct TestMessage);
-      memset (&cbuf[ret], last_msg_sent, s - sizeof (struct TestMessage));
-      ret += s - sizeof (struct TestMessage);
-#if DEBUG_MEASUREMENT
-      if (n % 5000 == 0)
-       {
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                      "Sending message %u\n",n);
-       }
 #endif
-
-    /*      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                      "Sending message %u\n",last_msg_sent);*/
-
-      s = get_size ();
-      if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16))
-       break; /* sometimes pack buffer full, sometimes not */
+      char *receiver_s = GNUNET_strdup (GNUNET_i2s (&receiver->id));
+
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Sending message %u of size %u from peer %u (`%4s') -> peer %u (`%s') !\n",
+                  n, s, sender->no, GNUNET_i2s (&sender->id), receiver->no,
+                  receiver_s);
+      GNUNET_free (receiver_s);
+#if 0
     }
+#endif
+    n++;
+    s = get_size (n);
+    if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16))
+      break;                    /* sometimes pack buffer full, sometimes not */
+  }
   while (size - ret >= s);
-  transmit_handle = GNUNET_TRANSPORT_notify_transmit_ready (p2.th,
-                                           &p1.id,
-                                           s, 0, SEND_TIMEOUT,
-                                           &notify_ready,
-                                           NULL);
-  total_bytes_sent += s;
+  if (n < TOTAL_MSGS)
+  {
+    if (th == NULL)
+      th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, s,
+                                                   TIMEOUT_TRANSMIT,
+                                                   &notify_ready, NULL);
+    msg_scheduled = n;
+  }
+  if (n % 5000 == 0)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Returning total message block of size %u\n", ret);
+  }
+  total_bytes_sent += ret;
+  if (n == TOTAL_MSGS)
+  {
+    FPRINTF (stderr, "%s",  "\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All messages sent\n");
+  }
   return ret;
 }
 
-static void measure (unsigned long long quota_p1, unsigned long long quota_p2 );
 
-static void measurement_counter
- (void *cls,
-          const struct GNUNET_SCHEDULER_TaskContext *tc)
+static void
+notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
-  measurement_counter_task = GNUNET_SCHEDULER_NO_TASK;
 
-  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
-       return;
+  struct PeerContext *p = cls;
 
-#if VERBOSE
-  fprintf(stderr,".");
-#endif
-  measurement_counter_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                                          &measurement_counter,
-                                                          NULL);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Peer %u (`%4s') connected to us!\n",
+              p->no,
+              GNUNET_i2s (peer));
 }
 
+
 static void
-measurement_end (void *cls,
-          const struct GNUNET_SCHEDULER_TaskContext *tc)
+notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
-  static int strike_counter;
-  unsigned long long  quota_allowed = 0;
-  int delta = 0;
+  struct PeerContext *p = cls;
 
-  measurement_task  = GNUNET_SCHEDULER_NO_TASK;
-  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
-       return;
-
-  measurement_running = GNUNET_NO;
-  struct GNUNET_TIME_Relative duration = GNUNET_TIME_absolute_get_difference(start_time, GNUNET_TIME_absolute_get());
-
-
-  if (measurement_counter_task != GNUNET_SCHEDULER_NO_TASK)
-  {
-    GNUNET_SCHEDULER_cancel (measurement_counter_task);
-    measurement_counter_task = GNUNET_SCHEDULER_NO_TASK;
-  }
-#if VERBOSE
-  fprintf(stderr,"\n");
-#endif
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Peer %u (`%4s') disconnected!\n",
+              p->no,
+              GNUNET_i2s (peer));
+  if (th != NULL)
+    GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
+  th = NULL;
 
-  if (transmit_handle != NULL)
-  {
-         GNUNET_TRANSPORT_notify_transmit_ready_cancel(transmit_handle);
-         transmit_handle = NULL;
-  }
+}
 
-  if (current_quota_p1 < current_quota_p2)
-         quota_allowed = current_quota_p1;
-  else
-         quota_allowed = current_quota_p2;
+static void
+sendtask ()
+{
+  start_time = GNUNET_TIME_absolute_get ();
+  th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, get_size (0),
+                                               TIMEOUT_TRANSMIT, &notify_ready,
+                                               NULL);
+}
 
 
-  if (MEASUREMENT_SOFT_LIMIT > (quota_allowed/10))
-         delta = MEASUREMENT_SOFT_LIMIT;
-  else
-         delta = (quota_allowed/10);
+static void
+measure (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  static int counter;
 
-  /* Throughput is far too slow. This is to prevent the test to exit with success when throughput is 0 */
-  if ((total_bytes_sent/(duration.rel_value / 1000)) < 100)
-  {
-         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                         "\nQuota compliance failed: \n"\
-                         "Hard quota limit allowed: %10llu kB/s (%llu B/s)\n"\
-                         "Soft quota limit allowed: %10llu kB/s (%llu B/s)\n"\
-                         "Throughput              : %10llu kB/s (%llu B/s)\n",
-                         (quota_allowed / (1024)), quota_allowed,
-                         ((quota_allowed+delta) / (1024)),  quota_allowed+delta,
-                         (total_bytes_sent/(duration.rel_value / 1000)/1024),
-                         total_bytes_sent/(duration.rel_value / 1000));
-         ok = 1;
-         end();
-  }
+  measure_task = NULL;
 
-  /* Throughput is bigger than allowed quota + some extra*/
-  if ((total_bytes_sent/(duration.rel_value / 1000)) > (quota_allowed + delta))
+  counter++;
+  if ((DURATION.rel_value_us / 1000 / 1000LL) < counter)
   {
-         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                         "\nQuota compliance failed: \n"\
-                         "Hard quota limit allowed: %10llu kB/s (%llu B/s)\n"\
-                         "Soft quota limit allowed: %10llu kB/s (%llu B/s)\n"\
-                         "Throughput              : %10llu kB/s (%llu B/s)\n", 
-                         (quota_allowed / (1024)), quota_allowed, 
-                         ((quota_allowed+delta) / (1024)),  quota_allowed+delta, 
-                         (total_bytes_sent/(duration.rel_value / 1000)/1024), 
-                         total_bytes_sent/(duration.rel_value / 1000));
-         ok = 1;
-         end();
-         return;
+    FPRINTF (stderr, "%s",  ".\n");
+    GNUNET_SCHEDULER_add_now (&end, NULL);
   }
   else
   {
-         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                         "\nQuota compliance ok: \n"\
-                         "Quota allowed: %10llu kB/s\n"\
-                         "Throughput   : %10llu kB/s\n", (quota_allowed / (1024)) , (total_bytes_sent/(duration.rel_value / 1000)/1024));
-         ok = 0;
+    FPRINTF (stderr, "%s",  ".");
+    measure_task =
+        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &measure, NULL);
   }
+}
 
-  if ((quota_allowed) > (2 *(total_bytes_sent/(duration.rel_value / 1000))))
-  {
-         strike_counter++;
-         if (strike_counter == 2)
-         {
-                 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                                 "Maximum transmission rate reached, stopping test\n");
-                 end();
-                 return;
-         }
-  }
-  else
-  {
-         strike_counter = 0;
-  }
 
-  if (quota_allowed == MEASUREMENT_MAX_QUOTA)
-  {
-         end();
-         return;
-  }
+static void
+testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
+{
+  char *p1_c = GNUNET_strdup (GNUNET_i2s (&p1->id));
 
-  if (is_asymmetric_send_constant == GNUNET_YES)
-  {
-   if ((quota_allowed * 2) < MEASUREMENT_MAX_QUOTA)
-         measure (current_quota_p1 * 2, MEASUREMENT_MAX_QUOTA);
-   else
-          measure (MEASUREMENT_MAX_QUOTA, MEASUREMENT_MAX_QUOTA);
-  }
-  else if (is_asymmetric_recv_constant == GNUNET_YES)
-  {
-   if ((quota_allowed * 2) < MEASUREMENT_MAX_QUOTA)
-         measure (MEASUREMENT_MAX_QUOTA, current_quota_p2 * 2);
-   else
-          measure (MEASUREMENT_MAX_QUOTA, MEASUREMENT_MAX_QUOTA);
-  }
-  else
-  {
-   if ((quota_allowed * 2) < MEASUREMENT_MAX_QUOTA)
-         measure ((current_quota_p1) * 2, (current_quota_p2) * 2);
-   else
-          measure (MEASUREMENT_MAX_QUOTA, MEASUREMENT_MAX_QUOTA);
-  }
-}
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peers connected: %u (%s) <-> %u (%s)\n",
+              p1->no, p1_c, p2->no, GNUNET_i2s (&p2->id));
+  GNUNET_free (p1_c);
 
-static void measure (unsigned long long quota_p1, unsigned long long quota_p2 )
-{
-         current_quota_p1 = quota_p1;
-         current_quota_p2 = quota_p2;
-#if VERBOSE
-  if ((is_asymmetric_send_constant == GNUNET_YES) || (is_asymmetric_recv_constant == GNUNET_YES))
-         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Starting transport level measurement for %u seconds, receiving peer quota %llu kB/s, sending peer quota %llu kB/s\n", MEASUREMENT_INTERVALL.rel_value / 1000 , current_quota_p1 / 1024, current_quota_p2 / 1024);
-  else
-         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Starting transport level measurement for %u seconds, symmetric quota %llu kB/s\n", MEASUREMENT_INTERVALL.rel_value / 1000 , current_quota_p2 / 1024);
+  cc = NULL;
+  test_connected = GNUNET_YES;
 
-#endif
-               GNUNET_TRANSPORT_set_quota (p1.th,
-                         &p2.id,
-                         GNUNET_BANDWIDTH_value_init (current_quota_p1 ),
-                         GNUNET_BANDWIDTH_value_init (current_quota_p1 ),
-                         GNUNET_TIME_UNIT_FOREVER_REL,
-                         NULL, NULL);
-               GNUNET_TRANSPORT_set_quota (p2.th,
-                         &p1.id,
-                         GNUNET_BANDWIDTH_value_init (current_quota_p2),
-                         GNUNET_BANDWIDTH_value_init (current_quota_p2),
-                         GNUNET_TIME_UNIT_FOREVER_REL,
-                         NULL, NULL);
-
-               GNUNET_SCHEDULER_cancel (die_task);
-               die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
-                                                  &end_badly,
-                                                  NULL);
-               if (measurement_counter_task != GNUNET_SCHEDULER_NO_TASK)
-                 GNUNET_SCHEDULER_cancel (measurement_counter_task);
-               measurement_counter_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                                                  &measurement_counter,
-                                                                  NULL);
-               measurement_task = GNUNET_SCHEDULER_add_delayed (MEASUREMENT_INTERVALL,
-                                                  &measurement_end,
-                                                  NULL);
-               total_bytes_sent = 0;
-               last_msg_sent = 0;
-               last_msg_recv = 0;
-               measurement_running = GNUNET_YES;
-               start_time = GNUNET_TIME_absolute_get ();
-
-               if (transmit_handle != NULL)
-                         GNUNET_TRANSPORT_notify_transmit_ready_cancel(transmit_handle);
-               transmit_handle = GNUNET_TRANSPORT_notify_transmit_ready (p2.th,
-                                                                                         &p1.id,
-                                                                                         get_size (), 0, SEND_TIMEOUT,
-                                                                                         &notify_ready,
-                                                                                         NULL);
-}
+  measure_task =
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &measure, NULL);
+  GNUNET_SCHEDULER_add_now (&sendtask, NULL);
 
-static void
-notify_connect (void *cls,
-                const struct GNUNET_PeerIdentity *peer,
-                struct GNUNET_TIME_Relative latency,
-               uint32_t distance)
-{
-  if (cls == &p1)
-    {
-#if DEBUG_CONNECTIONS
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Peer 1 `%4s' connected to us (%p)!\n", GNUNET_i2s (peer), cls);
-#endif
-         connected++;
-    }
-  else
-    {
-#if DEBUG_CONNECTIONS
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Peer 2 `%4s' connected to us (%p)!\n", GNUNET_i2s (peer), cls);
-#endif
-      connected++;
-    }
-  if (connected == 2)
-    {
-          if (is_asymmetric_send_constant == GNUNET_YES)
-                  measure (MEASUREMENT_MIN_QUOTA, MEASUREMENT_MAX_QUOTA);
-          else if (is_asymmetric_recv_constant == GNUNET_YES)
-                  measure (MEASUREMENT_MAX_QUOTA, MEASUREMENT_MIN_QUOTA);
-          else
-                  measure (MEASUREMENT_MIN_QUOTA, MEASUREMENT_MIN_QUOTA);
-    }
 }
 
-
-static void
-notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
+void
+start_cb (struct PeerContext *p, void *cls)
 {
-#if DEBUG_CONNECTIONS
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Peer `%4s' disconnected (%p)!\n",
-             GNUNET_i2s (peer), cls);
-#endif
-}
+  static int started;
 
+  started++;
 
-static void
-setup_peer (struct PeerContext *p, const char *cfgname)
-{
-  p->cfg = GNUNET_CONFIGURATION_create ();
-#if START_ARM
-  p->arm_proc = GNUNET_OS_start_process (NULL, NULL,
-                                       "gnunet-service-arm",
-                                        "gnunet-service-arm",
-#if VERBOSE_ARM
-                                        "-L", "DEBUG",
-#endif
-                                        "-c", cfgname, NULL);
-#endif
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') started\n", p->no,
+              GNUNET_i2s (&p->id));
 
-  GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
-  p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL,
-                                    p,
-                                    &notify_receive_new,
-                                    &notify_connect,
-                                   &notify_disconnect);
-  GNUNET_assert (p->th != NULL);
-}
+  if (started != 2)
+    return;
 
+  test_connected = GNUNET_NO;
 
-static void
-exchange_hello_last (void *cls,
-                     const struct GNUNET_MessageHeader *message)
-{
-  struct PeerContext *me = cls;
+  sender = p2;
+  receiver = p1;
 
-  GNUNET_TRANSPORT_get_hello_cancel (p2.th, &exchange_hello_last, me);
+  char *sender_c = GNUNET_strdup (GNUNET_i2s (&sender->id));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Test tries to send from %u (%s) -> peer %u (%s)\n", sender->no,
+              sender_c, receiver->no, GNUNET_i2s (&receiver->id));
+  GNUNET_free (sender_c);
+  cc = GNUNET_TRANSPORT_TESTING_connect_peers (tth, p1, p2, &testing_connect_cb,
+                                               NULL);
 
-  GNUNET_assert (ok >= 3);
-  OKPP;
-  GNUNET_assert (message != NULL);
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
-                                      message, &me->id));
-  /* both HELLOs exchanged, get ready to test transmission! */
 }
 
-
-static void
-exchange_hello (void *cls,
-                const struct GNUNET_MessageHeader *message)
+static char *
+generate_config (char *cfg_file, unsigned long long quota_in,
+                 unsigned long long quota_out)
 {
-  struct PeerContext *me = cls;
-
-  GNUNET_TRANSPORT_get_hello_cancel (p1.th, &exchange_hello, me);
-  GNUNET_assert (ok >= 2);
-  OKPP;
-  GNUNET_assert (message != NULL);
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
-                                      message, &me->id));
-  GNUNET_TRANSPORT_offer_hello (p2.th, message);
-  GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2);
+  char *in_name;
+  char *out_name;
+  char *fname = NULL;
+  struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create ();
+  int c;
+
+  GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (cfg, cfg_file));
+  GNUNET_asprintf (&fname, "q_in_%llu_q_out_%llu_%s", quota_in, quota_out,
+                   cfg_file);
+
+  GNUNET_CONFIGURATION_set_value_string (cfg, "PATHS", "DEFAULTCONFIG", fname);
+
+  for (c = 0; c < GNUNET_ATS_NetworkTypeCount; c++)
+  {
+    GNUNET_asprintf (&in_name,
+                     "%s_QUOTA_IN",
+                     GNUNET_ATS_print_network_type (c));
+    GNUNET_asprintf (&out_name,
+                     "%s_QUOTA_OUT",
+                     GNUNET_ATS_print_network_type (c));
+    GNUNET_CONFIGURATION_set_value_number (cfg, "ats", in_name, quota_in);
+    GNUNET_CONFIGURATION_set_value_number (cfg, "ats", out_name, quota_out);
+    GNUNET_free (in_name);
+    GNUNET_free (out_name);
+  }
+  GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_write (cfg, fname));
+  GNUNET_CONFIGURATION_destroy (cfg);
+  return fname;
 }
 
 static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+run_measurement (unsigned long long p1_quota_in,
+                 unsigned long long p1_quota_out,
+                 unsigned long long p2_quota_in,
+                 unsigned long long p2_quota_out)
 {
-  GNUNET_assert (ok == 1);
-  OKPP;
+  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
 
-  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
-                                          &end_badly,
-                                          NULL);
-  measurement_running = GNUNET_NO;
-  send_running = GNUNET_NO;
-  recv_running = GNUNET_NO;
+  /* setting ATS quota */
+  quota_out_p1 = p1_quota_out;
+  gen_cfg_p1 = generate_config (cfg_file_p1, p1_quota_in, p1_quota_out);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Generated config file `%s'\n",
+              gen_cfg_p1);
 
-  if (is_tcp)
-    {
-         if (is_asymmetric_recv_constant == GNUNET_YES)
-                 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing asymmetric quota compliance (receiver quota constant) for TCP transport plugin\n");
-         else if (is_asymmetric_send_constant == GNUNET_YES)
-                 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing asymmetric quota compliance (sender quota constant) for TCP transport plugin\n");
-         else
-                 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing symmetric quota compliance for TCP transport plugin\n");
-      setup_peer (&p1, "test_quota_compliance_tcp_peer1.conf");
-      setup_peer (&p2, "test_quota_compliance_tcp_peer2.conf");
-    }
-  else if (is_http)
-    {
-         if (is_asymmetric_recv_constant == GNUNET_YES)
-                 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing asymmetric quota compliance (receiver quota constant) for HTTP transport plugin\n");
-         else if (is_asymmetric_send_constant == GNUNET_YES)
-                 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing asymmetric quota compliance (sender quota constant) for HTTP transport plugin\n");
-         else
-                 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing symmetric quota compliance for HTTP transport plugin\n");
-      setup_peer (&p1, "test_quota_compliance_http_peer1.conf");
-      setup_peer (&p2, "test_quota_compliance_http_peer2.conf");
-    }
-  else if (is_https)
-    {
-         if (is_asymmetric_recv_constant == GNUNET_YES)
-                 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing asymmetric quota compliance (receiver quota constant) for HTTPS transport plugin\n");
-         else if (is_asymmetric_send_constant == GNUNET_YES)
-                 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing asymmetric quota compliance (sender quota constant) for HTTPS transport plugin\n");
-         else
-                 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing symmetric quota compliance for HTTPS transport plugin\n");
-      setup_peer (&p1, "test_quota_compliance_https_peer1.conf");
-      setup_peer (&p2, "test_quota_compliance_https_peer2.conf");
-    }
-  else if (is_udp)
-    {
-         if (is_asymmetric_recv_constant == GNUNET_YES)
-                 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing asymmetric quota compliance (receiver quota constant) for UDP transport plugin\n");
-         else if (is_asymmetric_send_constant == GNUNET_YES)
-                 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing asymmetric quota compliance (sender quota constant) for UDP transport plugin\n");
-         else
-                 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing symmetric quota compliance for UDP transport plugin\n");
-      setup_peer (&p1, "test_quota_compliance_udp_peer1.conf");
-      setup_peer (&p2, "test_quota_compliance_udp_peer2.conf");
-    }
-  else if (is_tcp_nat)
-    {
-         if (is_asymmetric_recv_constant == GNUNET_YES)
-                 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing asymmetric quota compliance (receiver quota constant) for TCP NAT transport plugin\n");
-         else if (is_asymmetric_send_constant == GNUNET_YES)
-                 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing asymmetric quota compliance (sender quota constant) for TCP NAT transport plugin\n");
-         else
-                 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing symmetric quota compliance for TCP NAT transport plugin\n");
-      setup_peer (&p1, "test_quota_compliance_tcp_peer1.conf");
-      setup_peer (&p2, "test_quota_compliance_tcp_peer2.conf");
-    }
-  else
-    GNUNET_assert (0);
+  quota_in_p2 = p2_quota_in;
+  gen_cfg_p2 = generate_config (cfg_file_p2, p2_quota_in, p2_quota_out);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Generated config file `%s'\n",
+              gen_cfg_p2);
+
+  p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, gen_cfg_p1, 1, &notify_receive,
+                                            &notify_connect, &notify_disconnect,
+                                            &start_cb, NULL);
+
+  p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, gen_cfg_p2, 2, &notify_receive,
+                                            &notify_connect, &notify_disconnect,
+                                            &start_cb, NULL);
 
-  GNUNET_assert(p1.th != NULL);
-  GNUNET_assert(p2.th != NULL);
-  GNUNET_TRANSPORT_get_hello (p1.th, &exchange_hello, &p1);
+  if ((p1 == NULL) || (p2 == NULL))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
+    if (die_task != NULL)
+      GNUNET_SCHEDULER_cancel (die_task);
+    die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+    return;
+  }
 }
 
-int
-main (int argc, char *argv[])
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  int ret = 0;
-#ifdef MINGW
-  return GNUNET_SYSERR;
-#endif
-  if (strstr(argv[0], "tcp_nat") != NULL)
-    {
-      is_tcp_nat = GNUNET_YES;
-    }
-  else if (strstr(argv[0], "tcp") != NULL)
-    {
-      is_tcp = GNUNET_YES;
-    }
-  else if (strstr(argv[0], "https") != NULL)
-    {
-      is_https = GNUNET_YES;
-    }
-  else if (strstr(argv[0], "http") != NULL)
-    {
-      is_http = GNUNET_YES;
-    }
-  else if (strstr(argv[0], "udp") != NULL)
-    {
-      is_udp = GNUNET_YES;
-    }
+  unsigned long long p1_quota_in = 10000;
+  unsigned long long p1_quota_out = 10000;
+  unsigned long long p2_quota_in = 10000;
+  unsigned long long p2_quota_out = 10000;
 
-  if (strstr(argv[0], "asymmetric_recv") != NULL)
+  if (NULL != strstr (test_name, "asymmetric"))
   {
-      is_asymmetric_recv_constant = GNUNET_YES;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Running asymmetric test with sending peer unlimited, receiving peer (in/out): %llu/%llu b/s \n",
+                p2_quota_in, p2_quota_out);
+    p1_quota_out = 1024 * 1024 * 1024;
+    p1_quota_in = 1024 * 1024 * 1024;
   }
   else
-         is_asymmetric_recv_constant = GNUNET_NO;
-  if (strstr(argv[0], "asymmetric_send") != NULL)
   {
-      is_asymmetric_send_constant = GNUNET_YES;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Running symmetric test with (in/out) %llu/%llu b/s \n",
+                p2_quota_in, p2_quota_out);
   }
-  else
-         is_asymmetric_send_constant = GNUNET_NO;
+  run_measurement (p1_quota_in, p1_quota_out, p2_quota_in, p2_quota_out);
+}
 
-  char * logger;
-  if (is_tcp == GNUNET_YES)
-  {
-         if (is_asymmetric_recv_constant == GNUNET_YES)
-                 GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","tcp","asymmetric_recv_constant");
-         else if (is_asymmetric_send_constant == GNUNET_YES)
-                 GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","tcp","asymmetric_send_constant");
-         else
-                 GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","tcp","symmetric");
-  }
-  if (is_udp == GNUNET_YES)
-  {
-         if (is_asymmetric_recv_constant == GNUNET_YES)
-                 GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","udp","asymmetric_recv_constant");
-         else if (is_asymmetric_send_constant == GNUNET_YES)
-                 GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","udp","asymmetric_send_constant");
-         else
-                 GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","udp","symmetric");
-  }
-  if (is_http == GNUNET_YES)
-  {
-         if (is_asymmetric_recv_constant == GNUNET_YES)
-                 GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","http","asymmetric_recv_constant");
-         else if (is_asymmetric_send_constant == GNUNET_YES)
-                 GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","http","asymmetric_send_constant");
-         else
-                 GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","http","symmetric");
-  }
-  if (is_https == GNUNET_YES)
-  {
-         if (is_asymmetric_recv_constant == GNUNET_YES)
-                 GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","https","asymmetric_recv_constant");
-         else if (is_asymmetric_send_constant == GNUNET_YES)
-                 GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","https","asymmetric_send_constant");
-         else
-                 GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","https","symmetric");
-  }
-  fprintf(stderr,  "Running `%s'\n", logger);
-  GNUNET_log_setup ("test-quota-compliance",
-#if VERBOSE
-                    "DEBUG",
-#else
-                    "WARNING",
-#endif
-                    NULL);
-  char *const argv1[] = { "test-quota-compliance",
+static int
+check ()
+{
+  static char *argv[] = { "test_transport-quota-compliance",
     "-c",
     "test_quota_compliance_data.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
     NULL
   };
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
+  static struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
-  ok = 1;
-  GNUNET_PROGRAM_run ((sizeof (argv1) / sizeof (char *)) - 1,
-                      argv1, logger , "nohelp",
-                      options, &run, &ok);
-  ret = ok;
-  stop_arm (&p1);
-  stop_arm (&p2);
-  GNUNET_free(logger);
-  GNUNET_DISK_directory_remove ("/tmp/test_quota_compliance_peer1");
-  GNUNET_DISK_directory_remove ("/tmp/test_quota_compliance_peer2");
-  return ret;
+
+  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name,
+                      "nohelp", options, &run, NULL);
+  return test_failed;
+}
+
+int
+main (int argc, char *argv[])
+{
+  GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name);
+
+  GNUNET_log_setup (test_name,
+                    "WARNING",
+                    NULL);
+
+  GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source);
+  GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0], test_source,
+                                                 &test_plugin);
+
+  tth = GNUNET_TRANSPORT_TESTING_init ();
+
+  GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1);
+  GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2);
+
+  check ();
+
+  GNUNET_free (cfg_file_p1);
+  GNUNET_free (cfg_file_p2);
+
+  if (GNUNET_YES == GNUNET_DISK_file_test (gen_cfg_p1))
+  {
+    GNUNET_DISK_directory_remove (gen_cfg_p1);
+    GNUNET_free (gen_cfg_p1);
+  }
+
+  if (GNUNET_YES == GNUNET_DISK_file_test (gen_cfg_p2))
+  {
+    GNUNET_DISK_directory_remove (gen_cfg_p2);
+    GNUNET_free (gen_cfg_p2);
+  }
+
+  GNUNET_free (test_source);
+  GNUNET_free (test_plugin);
+  GNUNET_free (test_name);
+
+  GNUNET_TRANSPORT_TESTING_done (tth);
+
+  return test_failed;
 }
 
+
 /* end of test_quota_compliance.c */