psyc: in-order message delivery
[oweals/gnunet.git] / src / core / test_core_quota_compliance.c
index 822dc2c46f1261fa5fd9e5ec612f4972da510941..bf9197f0c156bb0fe18e110a2cc5a7b7d461e6c1 100644 (file)
 /**
  * @file core/test_core_quota_compliance.c
  * @brief testcase for core_api.c focusing quota compliance on core level
- *
- * FIXME:
- * - make sure connect callback is invoked properly as well!
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_constants.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_core_service.h"
 #include "gnunet_getopt_lib.h"
 #include "gnunet_transport_service.h"
 #include "gnunet_statistics_service.h"
 
-#define VERBOSE GNUNET_YES
 
-#define START_ARM GNUNET_YES
-#define DEBUG_CONNECTIONS GNUNET_NO
+#define SYMMETRIC 0
+#define ASYMMETRIC_SEND_LIMITED 1
+#define ASYMMETRIC_RECV_LIMITED 2
 
 /**
  * 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.
  */
-#define TOTAL_MSGS (600 * 10)
-
-#define MEASUREMENT_MSG_SIZE 10240
-#define MEASUREMENT_MAX_QUOTA 1024 * 1024 * 1024
-#define MEASUREMENT_MIN_QUOTA 1024
-#define MEASUREMENT_INTERVALL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+#define TOTAL_MSGS (60000 * 10)
 
 /**
  * How long until we give up on transmitting the message?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 6000)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
 
 /**
  * What delay do we request from the core service for transmission?
- * Any value smaller than the CORK delay will disable CORKing, which
- * is what we want here.
  */
-#define FAST_TIMEOUT GNUNET_TIME_relative_divide (GNUNET_CONSTANTS_MAX_CORK_DELAY, 2)
+#define FAST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 150)
 
 #define MTYPE 12345
+#define MESSAGESIZE 1024
+#define MEASUREMENT_LENGTH GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
 
-static int is_asymmetric_send_constant;
-static int is_asymmetric_recv_constant;
-static unsigned long long current_quota_p1_in;
-static unsigned long long current_quota_p1_out;
-static unsigned long long current_quota_p2_in;
-static unsigned long long current_quota_p2_out;
-
-static unsigned long long total_bytes;
 static unsigned long long total_bytes_sent;
 static unsigned long long total_bytes_recv;
 
@@ -82,276 +64,437 @@ static struct GNUNET_TIME_Absolute start_time;
 
 static GNUNET_SCHEDULER_TaskIdentifier err_task;
 
-static GNUNET_SCHEDULER_TaskIdentifier send_task;
-
 static GNUNET_SCHEDULER_TaskIdentifier measure_task;
 
+static GNUNET_SCHEDULER_TaskIdentifier connect_task;
+
+
 struct PeerContext
 {
   struct GNUNET_CONFIGURATION_Handle *cfg;
-  struct GNUNET_STATISTICS_Handle *stats;
   struct GNUNET_CORE_Handle *ch;
-  struct GNUNET_PeerIdentity id;   
+  struct GNUNET_CORE_TransmitHandle *nth;
+  struct GNUNET_PeerIdentity id;
   struct GNUNET_TRANSPORT_Handle *th;
   struct GNUNET_MessageHeader *hello;
-
+  struct GNUNET_STATISTICS_Handle *stats;
+  struct GNUNET_TRANSPORT_GetHelloHandle *ghh;
   int connect_status;
-#if START_ARM
   struct GNUNET_OS_Process *arm_proc;
-#endif
 };
 
 static struct PeerContext p1;
-
 static struct PeerContext p2;
 
+static unsigned long long current_quota_p1_in;
+static unsigned long long current_quota_p1_out;
+static unsigned long long current_quota_p2_in;
+static unsigned long long current_quota_p2_out;
+
 static int ok;
-static int measurement_running;
+static int test;
+static int32_t tr_n;
+
+static int running;
 
-struct GNUNET_CORE_TransmitHandle * ch;
 
 #if VERBOSE
-#define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
+#define OKPP do { ok++; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
 #else
 #define OKPP do { ok++; } while (0)
 #endif
 
-struct TestMessage 
+struct TestMessage
 {
   struct GNUNET_MessageHeader header;
   uint32_t num;
 };
 
+static void
+process_hello (void *cls, const struct GNUNET_MessageHeader *message);
+
 static void
 terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  unsigned long long delta;
+  struct GNUNET_CORE_Handle *ch;
 
-  GNUNET_CORE_disconnect (p1.ch);
+  err_task = GNUNET_SCHEDULER_NO_TASK;
+  GNUNET_STATISTICS_destroy (p1.stats, GNUNET_NO);
+  GNUNET_STATISTICS_destroy (p2.stats, GNUNET_NO);
+  GNUNET_TRANSPORT_get_hello_cancel (p2.ghh);
+  GNUNET_TRANSPORT_get_hello_cancel (p1.ghh);
+  if (p1.nth != NULL)
+  {
+    GNUNET_CORE_notify_transmit_ready_cancel (p1.nth);
+    p1.nth = NULL;
+  }
+  if (connect_task != GNUNET_SCHEDULER_NO_TASK)
+  {
+    GNUNET_SCHEDULER_cancel (connect_task);
+    connect_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+  ch = p1.ch;
   p1.ch = NULL;
-  GNUNET_CORE_disconnect (p2.ch);
+  GNUNET_CORE_disconnect (ch);
+  ch = p2.ch;
   p2.ch = NULL;
+  GNUNET_CORE_disconnect (ch);
   GNUNET_TRANSPORT_disconnect (p1.th);
   p1.th = NULL;
   GNUNET_TRANSPORT_disconnect (p2.th);
   p2.th = NULL;
-  delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value;
-  ok = 0;
+  GNUNET_free_non_null (p1.hello);
+  GNUNET_free_non_null (p2.hello);
 }
 
 
 static void
 terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_break (0);
-  if (send_task != GNUNET_SCHEDULER_NO_TASK)
-         GNUNET_SCHEDULER_cancel (send_task);
-  GNUNET_CORE_disconnect (p1.ch);
+  err_task = GNUNET_SCHEDULER_NO_TASK;
+
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Testcase failed!\n");
+  //GNUNET_break (0);
+  if (p1.nth != NULL)
+  {
+    GNUNET_CORE_notify_transmit_ready_cancel (p1.nth);
+    p1.nth = NULL;
+  }
+  if (measure_task != GNUNET_SCHEDULER_NO_TASK)
+    GNUNET_SCHEDULER_cancel (measure_task);
+  if (connect_task != GNUNET_SCHEDULER_NO_TASK)
+  {
+    GNUNET_SCHEDULER_cancel (connect_task);
+    connect_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+
+  GNUNET_TRANSPORT_get_hello_cancel (p1.ghh);
+  GNUNET_TRANSPORT_get_hello_cancel (p2.ghh);
+  if (NULL != p1.ch)
+    GNUNET_CORE_disconnect (p1.ch);
   p1.ch = NULL;
-  GNUNET_CORE_disconnect (p2.ch);
+  if (NULL != p2.ch)
+    GNUNET_CORE_disconnect (p2.ch);
   p2.ch = NULL;
-  GNUNET_TRANSPORT_disconnect (p1.th);
+  if (NULL != p1.th)
+    GNUNET_TRANSPORT_disconnect (p1.th);
   p1.th = NULL;
-  GNUNET_TRANSPORT_disconnect (p2.th);
+  if (NULL != p2.th)
+    GNUNET_TRANSPORT_disconnect (p2.th);
   p2.th = NULL;
   ok = 42;
 }
 
-static void
-connect_notify (void *cls,
-                const struct GNUNET_PeerIdentity *peer,
-               struct GNUNET_TIME_Relative latency,
-               uint32_t distance)
-{
-  struct PeerContext *pc = cls;
-  GNUNET_assert (pc->connect_status == 0);
-  pc->connect_status = 1;
-#if DEBUG_CONNECTIONS
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Encrypted connection established to peer `%4s'\n",
-              GNUNET_i2s (peer));
-#endif
-}
-
 
 static void
-disconnect_notify (void *cls,
-                   const struct GNUNET_PeerIdentity *peer)
+try_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  struct PeerContext *pc = cls;
-  pc->connect_status = 0;
-#if DEBUG_CONNECTIONS
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Encrypted connection to `%4s' cut\n", GNUNET_i2s (peer));
-#endif
+  connect_task =
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &try_connect,
+                                    NULL);
+  GNUNET_TRANSPORT_try_connect (p1.th, &p2.id, NULL, NULL); /*FIXME TRY_CONNECT change */
+  GNUNET_TRANSPORT_try_connect (p2.th, &p1.id, NULL, NULL); /*FIXME TRY_CONNECT change */
 }
 
-
+/**
+ * Callback function to process statistic values.
+ *
+ * @param cls closure
+ * @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
-inbound_notify (void *cls,
-                const struct GNUNET_PeerIdentity *other,
-                const struct GNUNET_MessageHeader *message,
-               struct GNUNET_TIME_Relative latency,
-               uint32_t distance)
+print_stat (void *cls, const char *subsystem, const char *name, uint64_t value,
+            int is_persistent)
 {
-  total_bytes_recv += ntohs (message->size);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Core provides inbound data from `%4s' size %u.\n", GNUNET_i2s (other), ntohs (message->size));
-#if DEBUG_CONNECTIONS
-  #endif
+  if (cls == &p1)
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer1 %50s = %12llu\n", name,
+                (unsigned long long) value);
+  if (cls == &p2)
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer2 %50s = %12llu\n", name,
+                (unsigned long long) value);
   return GNUNET_OK;
 }
 
-
-static int
-outbound_notify (void *cls,
-                 const struct GNUNET_PeerIdentity *other,
-                 const struct GNUNET_MessageHeader *message,
-                struct GNUNET_TIME_Relative latency,
-                uint32_t distance)
+static void
+measurement_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-#if DEBUG_CONNECTIONS
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Core notifies about outbound data for `%4s'.\n",
-              GNUNET_i2s (other));
-#endif
-  return GNUNET_OK;
+  unsigned long long delta;
+  unsigned long long throughput_out;
+  unsigned long long throughput_in;
+  unsigned long long max_quota_in;
+  unsigned long long max_quota_out;
+  unsigned long long quota_delta;
+  enum GNUNET_ErrorType kind = GNUNET_ERROR_TYPE_DEBUG;
+
+  measure_task = GNUNET_SCHEDULER_NO_TASK;
+  FPRINTF (stdout, "%s",  "\n");
+  running = GNUNET_NO;
+
+  delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value_us;
+
+  throughput_out = total_bytes_sent * 1000000LL / delta;     /* convert to bytes/s */
+  throughput_in = total_bytes_recv * 1000000LL / delta;      /* convert to bytes/s */
+
+  max_quota_in = GNUNET_MIN (current_quota_p1_in, current_quota_p2_in);
+  max_quota_out = GNUNET_MIN (current_quota_p1_out, current_quota_p2_out);
+  if (max_quota_out < max_quota_in)
+    quota_delta = max_quota_in / 3;
+  else
+    quota_delta = max_quota_out / 3;
+
+  if ((throughput_out > (max_quota_out + quota_delta)) ||
+      (throughput_in > (max_quota_in + quota_delta)))
+    ok = 1; /* fail */
+  else
+    ok = 0; /* pass */
+  GNUNET_STATISTICS_get (p1.stats, "core", "# discarded CORE_SEND requests",
+                         GNUNET_TIME_UNIT_FOREVER_REL, NULL, &print_stat, &p1);
+
+  GNUNET_STATISTICS_get (p1.stats, "core",
+                         "# discarded CORE_SEND request bytes",
+                         GNUNET_TIME_UNIT_FOREVER_REL, NULL, &print_stat, &p1);
+  GNUNET_STATISTICS_get (p1.stats, "core",
+                         "# discarded lower priority CORE_SEND requests",
+                         GNUNET_TIME_UNIT_FOREVER_REL, NULL, &print_stat, NULL);
+  GNUNET_STATISTICS_get (p1.stats, "core",
+                         "# discarded lower priority CORE_SEND request bytes",
+                         GNUNET_TIME_UNIT_FOREVER_REL, NULL, &print_stat, &p1);
+  GNUNET_STATISTICS_get (p2.stats, "core", "# discarded CORE_SEND requests",
+                         GNUNET_TIME_UNIT_FOREVER_REL, NULL, &print_stat, &p2);
+
+  GNUNET_STATISTICS_get (p2.stats, "core",
+                         "# discarded CORE_SEND request bytes",
+                         GNUNET_TIME_UNIT_FOREVER_REL, NULL, &print_stat, &p2);
+  GNUNET_STATISTICS_get (p2.stats, "core",
+                         "# discarded lower priority CORE_SEND requests",
+                         GNUNET_TIME_UNIT_FOREVER_REL, NULL, &print_stat, &p2);
+  GNUNET_STATISTICS_get (p2.stats, "core",
+                         "# discarded lower priority CORE_SEND request bytes",
+                         GNUNET_TIME_UNIT_FOREVER_REL, NULL, &print_stat, &p2);
+
+  if (ok != 0)
+    kind = GNUNET_ERROR_TYPE_ERROR;
+  switch (test)
+  {
+  case SYMMETRIC:
+    GNUNET_log (kind, "Core quota compliance test with symmetric quotas: %s\n",
+                (0 == ok) ? "PASSED" : "FAILED");
+    break;
+  case ASYMMETRIC_SEND_LIMITED:
+    GNUNET_log (kind,
+                "Core quota compliance test with limited sender quota: %s\n",
+                (0 == ok) ? "PASSED" : "FAILED");
+    break;
+  case ASYMMETRIC_RECV_LIMITED:
+    GNUNET_log (kind,
+                "Core quota compliance test with limited receiver quota: %s\n",
+                (0 == ok) ? "PASSED" : "FAILED");
+    break;
+  };
+  GNUNET_log (kind, "Peer 1 send  rate: %llu b/s (%llu bytes in %llu ms)\n",
+              throughput_out, total_bytes_sent, delta);
+  GNUNET_log (kind, "Peer 1 send quota: %llu b/s\n", current_quota_p1_out);
+  GNUNET_log (kind, "Peer 2 receive  rate: %llu b/s (%llu bytes in %llu ms)\n",
+              throughput_in, total_bytes_recv, delta);
+  GNUNET_log (kind, "Peer 2 receive quota: %llu b/s\n", current_quota_p2_in);
+/*
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Max. inbound  quota allowed: %llu b/s\n",max_quota_in );
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Max. outbound quota allowed: %llu b/s\n",max_quota_out);
+*/
+  GNUNET_SCHEDULER_cancel (err_task);
+  err_task = GNUNET_SCHEDULER_add_now (&terminate_task, NULL);
+
 }
 
-static void
-next_fin (void *cls, int success)
+static size_t
+transmit_ready (void *cls, size_t size, void *buf)
 {
+  char *cbuf = buf;
+  struct TestMessage hdr;
+  unsigned int ret;
 
+  p1.nth = NULL;
+  GNUNET_assert (size <= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE);
+  if (buf == NULL)
+  {
+    if ((p1.ch != NULL) && (p1.connect_status == 1))
+      GNUNET_break (NULL !=
+                    (p1.nth =
+                     GNUNET_CORE_notify_transmit_ready (p1.ch, GNUNET_NO,
+                                                        GNUNET_CORE_PRIO_BEST_EFFORT,
+                                                        FAST_TIMEOUT, &p2.id,
+                                                        MESSAGESIZE,
+                                                        &transmit_ready, &p1)));
+    return 0;
+  }
+  GNUNET_assert (tr_n < TOTAL_MSGS);
+  ret = 0;
+  GNUNET_assert (size >= MESSAGESIZE);
+  GNUNET_assert (buf != NULL);
+  cbuf = buf;
+  do
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Sending message %u of size %u at offset %u\n", tr_n,
+                MESSAGESIZE, ret);
+    hdr.header.size = htons (MESSAGESIZE);
+    hdr.header.type = htons (MTYPE);
+    hdr.num = htonl (tr_n);
+    memcpy (&cbuf[ret], &hdr, sizeof (struct TestMessage));
+    ret += sizeof (struct TestMessage);
+    memset (&cbuf[ret], tr_n, MESSAGESIZE - sizeof (struct TestMessage));
+    ret += MESSAGESIZE - sizeof (struct TestMessage);
+    tr_n++;
+    if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16))
+      break;                    /* sometimes pack buffer full, sometimes not */
+  }
+  while (size - ret >= MESSAGESIZE);
+  GNUNET_SCHEDULER_cancel (err_task);
+  err_task =
+      GNUNET_SCHEDULER_add_delayed (TIMEOUT, &terminate_task_error, NULL);
+
+  total_bytes_sent += ret;
+  return ret;
 }
 
 
-static int
-check_2 (void *cls,
-         const char *subsystem,
-         const char *name, uint64_t value, int is_persistent)
-{
- fprintf(stderr, "%s %s %llu\n", subsystem, name, (long long unsigned int) value);
- return GNUNET_OK;
-}
 
 static void
-measurement_end (void *cls,
-          const struct GNUNET_SCHEDULER_TaskContext *tc)
+connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
-         struct GNUNET_TIME_Relative duration;
-
-         measure_task  = GNUNET_SCHEDULER_NO_TASK;
-         if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
-               return;
-
-         if (err_task != GNUNET_SCHEDULER_NO_TASK)
-                 GNUNET_SCHEDULER_cancel (err_task);
-         if (send_task != GNUNET_SCHEDULER_NO_TASK)
-                 GNUNET_SCHEDULER_cancel (send_task);
-
-         GNUNET_STATISTICS_get(p1.stats,"core","# discarded CORE_SEND requests",GNUNET_TIME_UNIT_SECONDS, &next_fin, &check_2, &p1);
-         GNUNET_STATISTICS_get(p1.stats,"core","# discarded CORE_SEND requests",GNUNET_TIME_UNIT_SECONDS, &next_fin, &check_2, &p2);
-         GNUNET_STATISTICS_get(p1.stats,"core","# discarded lower priority CORE_SEND requests",GNUNET_TIME_UNIT_SECONDS, &next_fin, &check_2, &p1);
-         GNUNET_STATISTICS_get(p1.stats,"core","# discarded lower priority CORE_SEND requests",GNUNET_TIME_UNIT_SECONDS, &next_fin, &check_2, &p2);
-
-         GNUNET_STATISTICS_get(p1.stats,"core","# discarded CORE_SEND request bytes",GNUNET_TIME_UNIT_SECONDS, &next_fin, &check_2, &p1);
-         GNUNET_STATISTICS_get(p1.stats,"core","# discarded CORE_SEND request bytes",GNUNET_TIME_UNIT_SECONDS, &next_fin, &check_2, &p2);
-         GNUNET_STATISTICS_get(p1.stats,"core","# discarded lower priority CORE_SEND request bytes",GNUNET_TIME_UNIT_SECONDS, &next_fin, &check_2, &p1);
-         GNUNET_STATISTICS_get(p1.stats,"core","# discarded lower priority CORE_SEND request bytes",GNUNET_TIME_UNIT_SECONDS, &next_fin, &check_2, &p2);
-         measurement_running = GNUNET_NO;
-         duration = GNUNET_TIME_absolute_get_difference(start_time, GNUNET_TIME_absolute_get());
-         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                         "\nQuota compliance: \n"\
-                         "Receive rate: %10llu kB/s\n"
-                         "Send rate   : %10llu kB/s\n"\
-                         "Quota       : %10llu kB/s\n",
-                         (total_bytes_recv/(duration.rel_value / 1000)/1024),
-                         (total_bytes_sent/(duration.rel_value / 1000)/1024),current_quota_p1_in/1024);
-
-
-      GNUNET_SCHEDULER_add_now (&terminate_task, NULL);
+  struct PeerContext *pc = cls;
+
+  if (0 == memcmp (&pc->id, peer, sizeof (struct GNUNET_PeerIdentity)))
+    return;                     /* loopback */
+  GNUNET_assert (pc->connect_status == 0);
+  pc->connect_status = 1;
+  if (pc == &p1)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Encrypted connection established to peer `%4s'\n",
+                GNUNET_i2s (peer));
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Asking core (1) for transmission to peer `%4s'\n",
+                GNUNET_i2s (&p2.id));
+    if (err_task != GNUNET_SCHEDULER_NO_TASK)
+      GNUNET_SCHEDULER_cancel (err_task);
+    err_task =
+        GNUNET_SCHEDULER_add_delayed (TIMEOUT, &terminate_task_error, NULL);
+    start_time = GNUNET_TIME_absolute_get ();
+    running = GNUNET_YES;
+    measure_task =
+        GNUNET_SCHEDULER_add_delayed (MEASUREMENT_LENGTH, &measurement_stop,
+                                      NULL);
+
+    GNUNET_break (NULL !=
+                  (p1.nth =
+                   GNUNET_CORE_notify_transmit_ready (p1.ch, GNUNET_NO,
+                                                      GNUNET_CORE_PRIO_BEST_EFFORT,
+                                                      TIMEOUT, &p2.id,
+                                                      MESSAGESIZE,
+                                                      &transmit_ready, &p1)));
+  }
 }
 
-static size_t
-transmit_ready (void *cls, size_t size, void *buf);
 
 static void
-send_tsk (void *cls,
-          const struct GNUNET_SCHEDULER_TaskContext *tc)
+disconnect_notify (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
-        send_task = GNUNET_SCHEDULER_NO_TASK;
-
-         ch = GNUNET_CORE_notify_transmit_ready (p1.ch,
-                                                                0,
-                                                                FAST_TIMEOUT,
-                                                                &p2.id,
-                                                                sizeof (struct TestMessage) + MEASUREMENT_MSG_SIZE,
-                                                                &transmit_ready, &p1);
+  struct PeerContext *pc = cls;
+
+  if (0 == memcmp (&pc->id, peer, sizeof (struct GNUNET_PeerIdentity)))
+    return;                     /* loopback */
+  pc->connect_status = 0;
+  if (GNUNET_SCHEDULER_NO_TASK != measure_task)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Measurement aborted due to disconnect!\n");
+    GNUNET_SCHEDULER_cancel (measure_task);
+    measure_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+  if (pc->nth != NULL)
+  {
+    GNUNET_CORE_notify_transmit_ready_cancel (pc->nth);
+    pc->nth = NULL;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Encrypted connection to `%4s' cut\n",
+              GNUNET_i2s (peer));
 }
 
-static void measure (unsigned long long quota_p1, unsigned long long quota_p2 )
+
+static int
+inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
+                const struct GNUNET_MessageHeader *message)
 {
-#if VERBOSE
-  if ((is_asymmetric_send_constant == GNUNET_YES) || (is_asymmetric_recv_constant == GNUNET_YES))
-         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Starting core 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_in / 1024, current_quota_p2_out / 1024);
-  else
-         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Starting core level measurement for %u seconds, symmetric quota %llu kB/s\n", MEASUREMENT_INTERVALL.rel_value / 1000 , current_quota_p2_out / 1024);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Core provides inbound data from `%4s' %llu.\n",
+              GNUNET_i2s (other), ntohs (message->size));
+  total_bytes_recv += ntohs (message->size);
+  return GNUNET_OK;
+}
 
-#endif
-#if DEBUG_CONNECTIONS
+
+static int
+outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
+                 const struct GNUNET_MessageHeader *message)
+{
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Asking core (1) for transmission to peer `%4s'\n",
-              GNUNET_i2s (&p2.id));
-#endif
-  err_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
-                             &terminate_task_error,
-                             NULL);
-  measure_task = GNUNET_SCHEDULER_add_delayed (MEASUREMENT_INTERVALL,
-                             &measurement_end,
-                             NULL);
-  start_time = GNUNET_TIME_absolute_get ();
-  measurement_running = GNUNET_YES;
-  total_bytes = 0;
-  total_bytes_sent = 0;
-  ch = GNUNET_CORE_notify_transmit_ready (p1.ch,
-                                              0,
-                                              TIMEOUT,
-                                              &p2.id,
-                                              sizeof (struct TestMessage) + MEASUREMENT_MSG_SIZE,
-                                              &transmit_ready, &p1);
+              "Core notifies about outbound data for `%4s'.\n",
+              GNUNET_i2s (other));
+  return GNUNET_OK;
 }
 
-static int tr_n;
 
+static size_t
+transmit_ready (void *cls, size_t size, void *buf);
 
 static int
-process_mtype (void *cls,
-               const struct GNUNET_PeerIdentity *peer,
-               const struct GNUNET_MessageHeader *message,
-              struct GNUNET_TIME_Relative latency,
-              uint32_t distance)
+process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer,
+               const struct GNUNET_MessageHeader *message)
 {
   static int n;
-  unsigned int s;
   const struct TestMessage *hdr;
 
-  hdr = (const struct TestMessage*) message;
-  s = sizeof (struct TestMessage) + MEASUREMENT_MSG_SIZE;
+  hdr = (const struct TestMessage *) message;
   if (MTYPE != ntohs (message->type))
     return GNUNET_SYSERR;
-
-#if DEBUG_CONNECTIONS
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Got message %u of size %u\n",
-             ntohl (hdr->num),
-             ntohs (message->size));         
-#endif
+  if (ntohs (message->size) != MESSAGESIZE)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Expected message %u of size %u, got %u bytes of message %u\n",
+                n, MESSAGESIZE, ntohs (message->size), ntohl (hdr->num));
+    GNUNET_SCHEDULER_cancel (err_task);
+    err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error, NULL);
+    return GNUNET_SYSERR;
+  }
+  if (ntohl (hdr->num) != n)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Expected message %u of size %u, got %u bytes of message %u\n",
+                n, MESSAGESIZE, ntohs (message->size), ntohl (hdr->num));
+    GNUNET_SCHEDULER_cancel (err_task);
+    err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error, NULL);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got message %u of size %u\n",
+              ntohl (hdr->num), ntohs (message->size));
   n++;
-  if (0 == (n % (TOTAL_MSGS/100)))
-    fprintf (stderr, ".");
+  if (0 == (n % 10))
+    FPRINTF (stderr, "%s",  ".");
+
 
+  if (running == GNUNET_YES)
+    GNUNET_break (NULL !=
+                  GNUNET_CORE_notify_transmit_ready (p1.ch, GNUNET_NO,
+                                                     GNUNET_CORE_PRIO_BEST_EFFORT,
+                                                     FAST_TIMEOUT, &p2.id,
+                                                     MESSAGESIZE,
+                                                     &transmit_ready, &p1));
   return GNUNET_OK;
 }
 
@@ -362,142 +505,60 @@ static struct GNUNET_CORE_MessageHandler handlers[] = {
 };
 
 
-static size_t
-transmit_ready (void *cls, size_t size, void *buf)
-{
-  char *cbuf = buf;
-  struct TestMessage hdr;
-  unsigned int s;
-  unsigned int ret;
-
-  if (measurement_running != GNUNET_YES)
-       return 0;
-
-  GNUNET_assert (size <= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE); 
-  if (buf == NULL)
-    {
-      if (p1.ch != NULL)
-      {
-               ch = GNUNET_CORE_notify_transmit_ready (p1.ch,
-                                                        0,
-                                                        FAST_TIMEOUT,
-                                                        &p2.id,
-                                                        sizeof (struct TestMessage) + MEASUREMENT_MSG_SIZE,
-                                                        &transmit_ready, &p1);
-               GNUNET_break (NULL != ch);
-      }
-      return 0;
-    }
-  ret = 0;
-  ch = NULL;
-  s = sizeof (struct TestMessage) + MEASUREMENT_MSG_SIZE;
-
-  GNUNET_assert (size >= s);
-  GNUNET_assert (buf != NULL);
-  cbuf = buf;
-  do
-    {
-#if DEBUG_CONNECTIONS
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 "Sending message %u of size %u at offset %u\n",
-                 tr_n,
-                 s,
-                 ret);
-#endif
-      hdr.header.size = htons (s);
-      hdr.header.type = htons (MTYPE);
-      hdr.num = htonl (tr_n);
-      memcpy (&cbuf[ret], &hdr, sizeof (struct TestMessage));
-      ret += sizeof (struct TestMessage);
-      memset (&cbuf[ret], tr_n, s - sizeof (struct TestMessage));
-      ret += s - sizeof (struct TestMessage);
-      tr_n++;
-      if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16))
-       break; /* sometimes pack buffer full, sometimes not */
-    }
-  while (size - ret >= s);
-  GNUNET_SCHEDULER_cancel (err_task);
-  err_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
-                                 &terminate_task_error, 
-                                 NULL);
-
-  total_bytes += ret;
-  total_bytes_sent += ret;
-  if (send_task != GNUNET_SCHEDULER_NO_TASK)
-         GNUNET_SCHEDULER_cancel(send_task);
-  send_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 20), &send_tsk, NULL);
-
-  return ret;
-}
-
-
 
 static void
 init_notify (void *cls,
-             struct GNUNET_CORE_Handle *server,
-             const struct GNUNET_PeerIdentity *my_identity,
-             const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+             const struct GNUNET_PeerIdentity *my_identity)
 {
   struct PeerContext *p = cls;
-#if DEBUG_CONNECTIONS
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Connection to CORE service of `%4s' established\n",
               GNUNET_i2s (my_identity));
-#endif
-  GNUNET_assert (server != NULL);
+  GNUNET_assert (NULL != my_identity);
   p->id = *my_identity;
-  p->ch = server;
   if (cls == &p1)
-    {
-      GNUNET_assert (ok == 2);
-      OKPP;
-      /* connect p2 */
-      GNUNET_CORE_connect (p2.cfg,
-                           TIMEOUT,
-                           &p2,
-                           &init_notify,                        
-                           &connect_notify,
-                           &disconnect_notify,
-                          NULL,
-                           &inbound_notify,
-                           GNUNET_YES,
-                           &outbound_notify, GNUNET_YES, handlers);
-    }
+  {
+    GNUNET_assert (ok == 2);
+    OKPP;
+    /* connect p2 */
+    p2.ch =
+        GNUNET_CORE_connect (p2.cfg, &p2, &init_notify, &connect_notify,
+                             &disconnect_notify, &inbound_notify, GNUNET_YES,
+                             &outbound_notify, GNUNET_YES, handlers);
+  }
   else
-    {
-      GNUNET_assert (ok == 3);
-      OKPP;
-      GNUNET_assert (cls == &p2);
-
-      measure (MEASUREMENT_MIN_QUOTA, MEASUREMENT_MIN_QUOTA);
-    }
+  {
+    GNUNET_assert (ok == 3);
+    OKPP;
+    GNUNET_assert (cls == &p2);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Asking core (1) to connect to peer `%4s'\n",
+                GNUNET_i2s (&p2.id));
+    connect_task = GNUNET_SCHEDULER_add_now (&try_connect, NULL);
+  }
 }
 
 
 static void
-process_hello (void *cls,
-               const struct GNUNET_MessageHeader *message)
+process_hello (void *cls, const struct GNUNET_MessageHeader *message)
 {
   struct PeerContext *p = cls;
 
-  GNUNET_TRANSPORT_get_hello_cancel (p->th, &process_hello, p);
-#if DEBUG_CONNECTIONS
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received (my) `%s' from transport service\n",
-              "HELLO");
-#endif
+              "Received (my) `%s' from transport service\n", "HELLO");
   GNUNET_assert (message != NULL);
   p->hello = GNUNET_malloc (ntohs (message->size));
   memcpy (p->hello, message, ntohs (message->size));
   if ((p == &p1) && (p2.th != NULL))
-    GNUNET_TRANSPORT_offer_hello (p2.th, message);
+    GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL);
   if ((p == &p2) && (p1.th != NULL))
-    GNUNET_TRANSPORT_offer_hello (p1.th, message);
+    GNUNET_TRANSPORT_offer_hello (p1.th, message, NULL, NULL);
 
   if ((p == &p1) && (p2.hello != NULL))
-    GNUNET_TRANSPORT_offer_hello (p1.th, p2.hello);
+    GNUNET_TRANSPORT_offer_hello (p1.th, p2.hello, NULL, NULL);
   if ((p == &p2) && (p1.hello != NULL))
-    GNUNET_TRANSPORT_offer_hello (p2.th, p1.hello);
+    GNUNET_TRANSPORT_offer_hello (p2.th, p1.hello, NULL, NULL);
 }
 
 
@@ -505,118 +566,173 @@ process_hello (void *cls,
 static void
 setup_peer (struct PeerContext *p, const char *cfgname)
 {
+  char *binary;
+
+  binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
   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
-                                        "-L", "DEBUG",
-#endif
-                                        "-c", cfgname, NULL);
-#endif
+  p->arm_proc =
+    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, 
+                             NULL, NULL, NULL,
+                             binary,
+                             "gnunet-service-arm",
+                             "-c", cfgname, NULL);
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
   p->stats = GNUNET_STATISTICS_create ("core", p->cfg);
   GNUNET_assert (p->stats != NULL);
   p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, NULL, NULL);
   GNUNET_assert (p->th != NULL);
-  GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p);
+  p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p);
+  GNUNET_free (binary);
 }
 
 
 static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile,
+run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   GNUNET_assert (ok == 1);
   OKPP;
-  setup_peer (&p1, "test_core_quota_peer1.conf");
-  setup_peer (&p2, "test_core_quota_peer2.conf");
-  GNUNET_CORE_connect (p1.cfg,
-                       TIMEOUT,
-                       &p1,
-                       &init_notify,
-                       &connect_notify,
-                       &disconnect_notify,
-                       NULL,
-                       &inbound_notify,
-                       GNUNET_YES, &outbound_notify, GNUNET_YES, handlers);
-
-  GNUNET_assert (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_number (p1.cfg,
-                                         "CORE",
-                                         "TOTAL_QUOTA_IN",
-                                         &current_quota_p1_in));
-  GNUNET_assert (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_number (p2.cfg,
-                                         "CORE",
-                                         "TOTAL_QUOTA_IN",
-                                         &current_quota_p2_in));
-  GNUNET_assert (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_number (p1.cfg,
-                                         "CORE",
-                                         "TOTAL_QUOTA_OUT",
-                                         &current_quota_p1_out));
-  GNUNET_assert (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_number (p2.cfg,
-                                         "CORE",
-                                         "TOTAL_QUOTA_OUT",
-                                         &current_quota_p2_out));
+  err_task =
+      GNUNET_SCHEDULER_add_delayed (TIMEOUT, &terminate_task_error, NULL);
+  if (test == SYMMETRIC)
+  {
+    setup_peer (&p1, "test_core_quota_peer1.conf");
+    setup_peer (&p2, "test_core_quota_peer2.conf");
+  }
+  else if (test == ASYMMETRIC_SEND_LIMITED)
+  {
+    setup_peer (&p1, "test_core_quota_asymmetric_send_limit_peer1.conf");
+    setup_peer (&p2, "test_core_quota_asymmetric_send_limit_peer2.conf");
+  }
+  else if (test == ASYMMETRIC_RECV_LIMITED)
+  {
+    setup_peer (&p1, "test_core_quota_asymmetric_recv_limited_peer1.conf");
+    setup_peer (&p2, "test_core_quota_asymmetric_recv_limited_peer2.conf");
+  }
+
+  GNUNET_assert (test != -1);
+  GNUNET_assert (GNUNET_SYSERR !=
+                 GNUNET_CONFIGURATION_get_value_size (p1.cfg, "ATS",
+                                                      "WAN_QUOTA_IN",
+                                                      &current_quota_p1_in));
+  GNUNET_assert (GNUNET_SYSERR !=
+                 GNUNET_CONFIGURATION_get_value_size (p2.cfg, "ATS",
+                                                      "WAN_QUOTA_IN",
+                                                      &current_quota_p2_in));
+  GNUNET_assert (GNUNET_SYSERR !=
+                 GNUNET_CONFIGURATION_get_value_size (p1.cfg, "ATS",
+                                                      "WAN_QUOTA_OUT",
+                                                      &current_quota_p1_out));
+  GNUNET_assert (GNUNET_SYSERR !=
+                 GNUNET_CONFIGURATION_get_value_size (p2.cfg, "ATS",
+                                                      "WAN_QUOTA_OUT",
+                                                      &current_quota_p2_out));
+
+  p1.ch =
+      GNUNET_CORE_connect (p1.cfg, &p1, &init_notify, &connect_notify,
+                           &disconnect_notify, &inbound_notify, GNUNET_YES,
+                           &outbound_notify, GNUNET_YES, handlers);
 }
 
 
 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");
-  if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
-       GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"ARM process stopped\n");
-  GNUNET_OS_process_close (p->arm_proc);
+  if (0 != GNUNET_OS_process_kill (p->arm_proc, GNUNET_TERM_SIG))
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+  if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK)
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n",
+              GNUNET_OS_process_get_pid (p->arm_proc));
+  GNUNET_OS_process_destroy (p->arm_proc);
   p->arm_proc = NULL;
-#endif
-  GNUNET_STATISTICS_destroy (p->stats, 0);
   GNUNET_CONFIGURATION_destroy (p->cfg);
 }
 
+
 static int
 check ()
 {
   char *const argv[] = { "test-core-quota-compliance",
     "-c",
     "test_core_api_data.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
     NULL
   };
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
   ok = 1;
-  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                      argv, "test_core_quota_compliance", "nohelp", options, &run, &ok);
+  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
+                      "test-core-quota-compliance", "nohelp", options, &run,
+                      &ok);
   stop_arm (&p1);
   stop_arm (&p2);
   return ok;
 }
 
+
 int
 main (int argc, char *argv[])
 {
   int ret;
 
-  GNUNET_log_setup ("test-core-api",
-#if VERBOSE
-                    "DEBUG",
-#else
+  test = -1;
+  if (strstr (argv[0], "_symmetric") != NULL)
+  {
+    test = SYMMETRIC;
+  }
+  else if (strstr (argv[0], "_asymmetric_send") != NULL)
+  {
+    test = ASYMMETRIC_SEND_LIMITED;
+  }
+  else if (strstr (argv[0], "_asymmetric_recv") != NULL)
+  {
+    test = ASYMMETRIC_RECV_LIMITED;
+  }
+  GNUNET_assert (test != -1);
+  if (test == SYMMETRIC)
+  {
+    GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-sym-peer-1/");
+    GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-sym-peer-2/");
+  }
+  else if (test == ASYMMETRIC_SEND_LIMITED)
+  {
+    GNUNET_DISK_directory_remove
+        ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-1/");
+    GNUNET_DISK_directory_remove
+        ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-2/");
+  }
+  else if (test == ASYMMETRIC_RECV_LIMITED)
+  {
+    GNUNET_DISK_directory_remove
+        ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/");
+    GNUNET_DISK_directory_remove
+        ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/");
+  }
+
+  GNUNET_log_setup ("test-core-quota-compliance",
                     "WARNING",
-#endif
                     NULL);
   ret = check ();
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-peer-2");
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-peer-2");
-
+  if (test == SYMMETRIC)
+  {
+    GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-sym-peer-1/");
+    GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-sym-peer-2/");
+  }
+  else if (test == ASYMMETRIC_SEND_LIMITED)
+  {
+    GNUNET_DISK_directory_remove
+        ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-1/");
+    GNUNET_DISK_directory_remove
+        ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-2/");
+  }
+  else if (test == ASYMMETRIC_RECV_LIMITED)
+  {
+    GNUNET_DISK_directory_remove
+        ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/");
+    GNUNET_DISK_directory_remove
+        ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/");
+  }
   return ret;
 }