fixes
[oweals/gnunet.git] / src / core / test_core_quota_compliance.c
index 88a735736e8ae6544d165d7abd3c3da1d452a3c2..d951113fc908c14dd4a99ea4e72cd4f9bb126286 100644 (file)
@@ -20,9 +20,6 @@
 /**
  * @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_transport_service.h"
 #include "gnunet_statistics_service.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
+#define DEBUG_TRANSMISSION GNUNET_NO
+
+#define SYMMETRIC 0
+#define ASYMMETRIC_SEND_LIMITED 1
+#define ASYMMETRIC_RECV_LIMITED 2
 
 #define START_ARM GNUNET_YES
-#define DEBUG_CONNECTIONS GNUNET_NO
 
 /**
  * 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, 180)
 
 /**
  * What delay do we request from the core service for transmission?
 #define FAST_TIMEOUT GNUNET_TIME_relative_divide (GNUNET_CONSTANTS_MAX_CORK_DELAY, 2)
 
 #define MTYPE 12345
+#define MESSAGESIZE 1024
+#define MEASUREMENT_LENGTH GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
 
-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,19 +72,17 @@ 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;
 
+
 struct PeerContext
 {
   struct GNUNET_CONFIGURATION_Handle *cfg;
-  struct GNUNET_STATISTICS_Handle *stats;
   struct GNUNET_CORE_Handle *ch;
   struct GNUNET_PeerIdentity id;   
   struct GNUNET_TRANSPORT_Handle *th;
   struct GNUNET_MessageHeader *hello;
-
+  struct GNUNET_STATISTICS_Handle *stats;
   int connect_status;
 #if START_ARM
   struct GNUNET_OS_Process *arm_proc;
@@ -102,13 +90,19 @@ struct PeerContext
 };
 
 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)
@@ -125,27 +119,31 @@ struct TestMessage
 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);
+  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;
 }
 
 
 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);
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+         GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Testcase failed!\n");
+  //GNUNET_break (0);
+
+  if (measure_task != GNUNET_SCHEDULER_NO_TASK)
+         GNUNET_SCHEDULER_cancel(measure_task);
+
   GNUNET_CORE_disconnect (p1.ch);
   p1.ch = NULL;
   GNUNET_CORE_disconnect (p2.ch);
@@ -157,18 +155,252 @@ terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   ok = 42;
 }
 
-static void connect_notify (void *cls,
+
+/**
+ * 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
+print_stat (void *cls,
+           const char *subsystem,
+           const char *name,
+           uint64_t value,
+           int is_persistent)
+{
+  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 void
+measurement_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  unsigned long long int delta;
+  unsigned long long int throughput_out;
+  unsigned long long int throughput_in;
+  unsigned long long int max_quota_in;
+  unsigned long long int max_quota_out;
+  unsigned long long int quota_delta;
+
+  measure_task = GNUNET_SCHEDULER_NO_TASK;
+  fprintf(stdout,"\n");
+  running = GNUNET_NO;
+
+  delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value;
+
+  throughput_out = total_bytes_sent * 1000 / 1024 / delta;
+  throughput_in = total_bytes_recv * 1000 / 1024 / delta;
+
+  if (current_quota_p1_in < current_quota_p2_in)
+         max_quota_in = current_quota_p1_in;
+  else
+         max_quota_in = current_quota_p2_in;
+  if (current_quota_p1_out < current_quota_p2_out)
+         max_quota_out = current_quota_p1_out;
+  else
+         max_quota_out = current_quota_p2_out;
+
+  if (max_quota_out < max_quota_in)
+         quota_delta = max_quota_in / 10;
+  else
+         quota_delta = max_quota_out / 10;
+
+  if ((throughput_out > (max_quota_out+quota_delta)/1024) || (throughput_in > (max_quota_in+quota_delta)/1024))
+         ok = 1;
+  else
+         ok = 0;
+
+  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);
+
+  enum GNUNET_ErrorType kind = GNUNET_ERROR_TYPE_DEBUG;
+  if (ok==1)
+  {
+         kind = GNUNET_ERROR_TYPE_ERROR;
+  }
+  switch (test)
+  {
+  case SYMMETRIC:
+         GNUNET_log (kind,"Core quota compliance test with symmetric quotas: %s\n", (ok==0)?"PASSED":"FAILED");
+         break;
+  case ASYMMETRIC_SEND_LIMITED:
+         GNUNET_log (kind,"Core quota compliance test with limited sender quota: %s\n", (ok==0)?"PASSED":"FAILED");
+         break;
+  case ASYMMETRIC_RECV_LIMITED:
+         GNUNET_log (kind,"Core quota compliance test with limited receiver quota: %s\n", (ok==0)?"PASSED":"FAILED");
+         break;
+  };
+  GNUNET_log (kind,"Peer 1 send  rate: %llu kB/s (%llu Bytes in %u sec.)\n",throughput_out,total_bytes_sent, delta/1000);
+  GNUNET_log (kind,"Peer 1 send quota: %llu kB/s\n",current_quota_p1_out / 1024);
+  GNUNET_log (kind,"Peer 2 receive  rate: %llu kB/s (%llu Bytes in %u sec.)\n",throughput_in,total_bytes_recv, delta/1000);
+  GNUNET_log (kind,"Peer 2 receive quota: %llu kB/s\n",current_quota_p2_in / 1024);
+/*
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Max. inbound  quota allowed: %llu kB/s\n",max_quota_in /1024);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Max. outbound quota allowed: %llu kB/s\n",max_quota_out/1024);
+*/
+  GNUNET_SCHEDULER_cancel (err_task);
+  GNUNET_SCHEDULER_add_now (&terminate_task, NULL);
+
+}
+
+static size_t
+transmit_ready (void *cls, size_t size, void *buf)
+{
+  char *cbuf = buf;
+  struct TestMessage hdr;
+  unsigned int ret;
+
+  GNUNET_assert (size <= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE);
+  if (buf == NULL)
+    {
+      if ( (p1.ch != NULL) &&
+          (p1.connect_status == 1) )
+       GNUNET_break (NULL !=
+                     GNUNET_CORE_notify_transmit_ready (p1.ch,
+                                                        0,
+                                                        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
+    {
+#if DEBUG_TRANSMISSION
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Sending message %u of size %u at offset %u\n",
+                 tr_n,
+                 MESSAGESIZE,
+                 ret);
+#endif
+      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 void
+connect_notify (void *cls,
                 const struct GNUNET_PeerIdentity *peer,
-               const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
 {
   struct PeerContext *pc = cls;
+
+  if (0 == memcmp (&pc->id,
+                  peer,
+                  sizeof (struct GNUNET_PeerIdentity)))
+    return;
   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));
+  if (pc == &p1)
+    {
+#if DEBUG_TRANSMISSION
+      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));
 #endif
+      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 != GNUNET_CORE_notify_transmit_ready (p1.ch,
+                                                      0,
+                                                      TIMEOUT,
+                                                      &p2.id,
+                                                      MESSAGESIZE,
+                                                      &transmit_ready, &p1));
+    }
 }
 
 
@@ -177,8 +409,13 @@ disconnect_notify (void *cls,
                    const struct GNUNET_PeerIdentity *peer)
 {
   struct PeerContext *pc = cls;
+
+  if (0 == memcmp (&pc->id,
+                  peer,
+                  sizeof (struct GNUNET_PeerIdentity)))
+    return;
   pc->connect_status = 0;
-#if DEBUG_CONNECTIONS
+#if DEBUG_TRANSMISSION
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Encrypted connection to `%4s' cut\n", GNUNET_i2s (peer));
 #endif
@@ -191,11 +428,11 @@ inbound_notify (void *cls,
                 const struct GNUNET_MessageHeader *message,
                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
 {
-  total_bytes_recv += ntohs (message->size);
+#if DEBUG_TRANSMISSION
   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
+              "Core provides inbound data from `%4s' %llu.\n", GNUNET_i2s (other), ntohs(message->size));
+#endif
+  total_bytes_recv += ntohs(message->size);
   return GNUNET_OK;
 }
 
@@ -206,7 +443,7 @@ outbound_notify (void *cls,
                  const struct GNUNET_MessageHeader *message,
                 const struct GNUNET_TRANSPORT_ATS_Information *atsi)
 {
-#if DEBUG_CONNECTIONS
+#if DEBUG_TRANSMISSION
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Core notifies about outbound data for `%4s'.\n",
               GNUNET_i2s (other));
@@ -214,115 +451,10 @@ outbound_notify (void *cls,
   return GNUNET_OK;
 }
 
-static void
-next_fin (void *cls, int success)
-{
-
-}
-
-
-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)
-{
-  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);
-}
 
 static size_t
 transmit_ready (void *cls, size_t size, void *buf);
 
-static void
-send_tsk (void *cls,
-          const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  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);
-}
-
-
-static void 
-measure (unsigned long long quota_p1, unsigned long long quota_p2)
-{
-#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);
-
-#endif
-#if DEBUG_CONNECTIONS
-  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);
-}
-
-static int tr_n;
-
-
 static int
 process_mtype (void *cls,
                const struct GNUNET_PeerIdentity *peer,
@@ -330,24 +462,52 @@ process_mtype (void *cls,
               const struct GNUNET_TRANSPORT_ATS_Information *atsi)
 {
   static int n;
-  unsigned int s;
   const struct TestMessage *hdr;
 
   hdr = (const struct TestMessage*) message;
-  s = sizeof (struct TestMessage) + MEASUREMENT_MSG_SIZE;
   if (MTYPE != ntohs (message->type))
     return GNUNET_SYSERR;
-
-#if DEBUG_CONNECTIONS
+  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;
+    }
+#if DEBUG_TRANSMISSION
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Got message %u of size %u\n",
              ntohl (hdr->num),
              ntohs (message->size));         
 #endif
   n++;
-  if (0 == (n % (TOTAL_MSGS/100)))
+  if (0 == (n % 10))
     fprintf (stderr, ".");
 
+
+  if (running == GNUNET_YES)
+       GNUNET_break (NULL !=
+                     GNUNET_CORE_notify_transmit_ready (p1.ch,
+                                                        0,
+                                                        FAST_TIMEOUT,
+                                                        &p2.id,
+                                                        MESSAGESIZE,
+                                                        &transmit_ready, &p1));
   return GNUNET_OK;
 }
 
@@ -358,75 +518,6 @@ 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,
@@ -435,11 +526,10 @@ init_notify (void *cls,
              const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
 {
   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);
   p->id = *my_identity;
   p->ch = server;
@@ -463,8 +553,15 @@ init_notify (void *cls,
       GNUNET_assert (ok == 3);
       OKPP;
       GNUNET_assert (cls == &p2);
-
-      measure (MEASUREMENT_MIN_QUOTA, MEASUREMENT_MIN_QUOTA);
+#if DEBUG_TRANSMISSION
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Asking core (1) to connect to peer `%4s'\n",
+                  GNUNET_i2s (&p2.id));
+#endif
+      GNUNET_CORE_peer_request_connect (p1.ch,
+                                       GNUNET_TIME_UNIT_SECONDS,
+                                       &p2.id,
+                                       NULL, NULL);
     }
 }
 
@@ -476,7 +573,8 @@ process_hello (void *cls,
   struct PeerContext *p = cls;
 
   GNUNET_TRANSPORT_get_hello_cancel (p->th, &process_hello, p);
-#if DEBUG_CONNECTIONS
+
+#if DEBUG_TRANSMISSION
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received (my) `%s' from transport service\n",
               "HELLO");
@@ -510,8 +608,8 @@ setup_peer (struct PeerContext *p, const char *cfgname)
                                         "-c", cfgname, NULL);
 #endif
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
-  p->stats = GNUNET_STATISTICS_create ("core", p->cfg);
-  GNUNET_assert (p->stats != NULL);
+  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);
@@ -526,17 +624,26 @@ run (void *cls,
 {
   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, 1,
-                       &p1,
-                       &init_notify,
-                       &connect_notify,
-                       &disconnect_notify,
-                       NULL,
-                       &inbound_notify,
-                       GNUNET_YES, &outbound_notify, GNUNET_YES, handlers);
+  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_number (p1.cfg,
                                          "CORE",
                                          "TOTAL_QUOTA_IN",
@@ -553,6 +660,15 @@ run (void *cls,
                                          "CORE",
                                          "TOTAL_QUOTA_OUT",
                                          &current_quota_p2_out));
+
+  GNUNET_CORE_connect (p1.cfg, 1,
+                       &p1,
+                       &init_notify,
+                       &connect_notify,
+                       &disconnect_notify,
+                       NULL,
+                       &inbound_notify,
+                       GNUNET_YES, &outbound_notify, GNUNET_YES, handlers);
 }
 
 
@@ -561,21 +677,22 @@ 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_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_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_close (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",
@@ -589,7 +706,7 @@ check ()
   };
   ok = 1;
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                      argv, "test_core_quota_compliance", "nohelp", options, &run, &ok);
+                      argv, "test-core-quota-compliance", "nohelp", options, &run, &ok);
   stop_arm (&p1);
   stop_arm (&p2);
   return ok;
@@ -600,6 +717,36 @@ main (int argc, char *argv[])
 {
   int ret;
 
+  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",
 #if VERBOSE
                     "DEBUG",
@@ -608,10 +755,24 @@ main (int argc, char *argv[])
 #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;
 }
-
-/* end of test_core_quota_compliance.c */
+/* end of test_core_api_reliability.c */