wip

[oweals/gnunet.git] / src / transport / test_quota_compliance.c

diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c
index 56d3cb5a4fc10e4a7777b1335c5dcab4ce527f79..219971725578acc47f2ec042c5019f49ef73da5a 100644 (file)
--- a/src/transport/test_quota_compliance.c
+++ b/src/transport/test_quota_compliance.c
@@ -139,6 +139,7 @@ static int is_tcp_nat;
 static int is_http;
 static int is_https;
 static int is_udp;
+static int is_unix;
 static int is_asymmetric_send_constant;
 static int is_asymmetric_recv_constant;
 
@@ -148,7 +149,7 @@ 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;
+static struct GNUNET_TRANSPORT_TransmitHandle * transmit_handle;
 
 #define OKPP do { ok++; } while (0)
 
@@ -361,7 +362,7 @@ measurement_end (void *cls,
           const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   static int strike_counter;
-  static int failed_measurement_counter;
+  static int failed_measurement_counter = 1;
   unsigned long long  quota_allowed = 0;
   int delta = 0;
 
@@ -391,10 +392,10 @@ measurement_end (void *cls,
          quota_allowed = current_quota_p2;
 
 
-  if (MEASUREMENT_SOFT_LIMIT > (quota_allowed/10))
+  if (MEASUREMENT_SOFT_LIMIT > (quota_allowed/3))
          delta = MEASUREMENT_SOFT_LIMIT;
   else
-         delta = (quota_allowed/10);
+         delta = (quota_allowed/3);
 
   /* 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)
@@ -411,8 +412,15 @@ measurement_end (void *cls,
          ok = 1;
          failed_measurement_counter--;
          if (failed_measurement_counter < 0)
+         {
+                 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                                 "\nQuota measurement failed and no free strike: %i\n",failed_measurement_counter);
                  end();
-         return;
+                 return;
+         }
+         else
+                 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                                 "\nQuota measurement failed and %i free strikes\n",failed_measurement_counter);
   }
 
   /* Throughput is bigger than allowed quota + some extra*/
@@ -430,8 +438,15 @@ measurement_end (void *cls,
          ok = 1;
          failed_measurement_counter--;
          if (failed_measurement_counter < 0)
+         {
+                 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                                 "\nQuota measurement failed and no free strike: %i\n",failed_measurement_counter);
                  end();
-         return;
+                 return;
+         }
+         else
+                 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                                 "\nQuota measurement failed and %i free strikes\n",failed_measurement_counter);
   }
   else
   {
@@ -609,6 +624,11 @@ setup_peer (struct PeerContext *p, const char *cfgname)
   GNUNET_assert (p->th != NULL);
 }
 
+static size_t
+notify_ready_connect (void *cls, size_t size, void *buf)
+{
+  return 0;
+}
 
 static void
 exchange_hello_last (void *cls,
@@ -624,6 +644,14 @@ exchange_hello_last (void *cls,
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
                                       message, &me->id));
+
+  GNUNET_assert(NULL != (transmit_handle = GNUNET_TRANSPORT_notify_transmit_ready (p2.th,
+                                          &p1.id,
+                                          sizeof (struct GNUNET_MessageHeader), 0,
+                                          TIMEOUT,
+                                          &notify_ready_connect,
+                                          NULL)));
+
   /* both HELLOs exchanged, get ready to test transmission! */
 }
 
@@ -641,7 +669,7 @@ exchange_hello (void *cls,
   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_offer_hello (p2.th, message, NULL, NULL);
   GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2);
 }
 
@@ -704,6 +732,17 @@ run (void *cls,
       setup_peer (&p1, "test_quota_compliance_udp_peer1.conf");
       setup_peer (&p2, "test_quota_compliance_udp_peer2.conf");
     }
+  else if (is_unix)
+    {
+          if (is_asymmetric_recv_constant == GNUNET_YES)
+                  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing asymmetric quota compliance (receiver quota constant) for UNIX 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 UNIX transport plugin\n");
+          else
+                  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing symmetric quota compliance for UNIX transport plugin\n");
+      setup_peer (&p1, "test_quota_compliance_unix_peer1.conf");
+      setup_peer (&p2, "test_quota_compliance_unix_peer2.conf");
+    }
   else if (is_tcp_nat)
     {
          if (is_asymmetric_recv_constant == GNUNET_YES)
@@ -750,6 +789,10 @@ main (int argc, char *argv[])
     {
       is_udp = GNUNET_YES;
     }
+  else if (strstr(argv[0], "unix") != NULL)
+    {
+      is_unix = GNUNET_YES;
+    }
 
   if (strstr(argv[0], "asymmetric_recv") != NULL)
   {
@@ -774,7 +817,7 @@ main (int argc, char *argv[])
          else
                  GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","tcp","symmetric");
   }
-  if (is_udp == GNUNET_YES)
+  else if (is_udp == GNUNET_YES)
   {
          if (is_asymmetric_recv_constant == GNUNET_YES)
                  GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","udp","asymmetric_recv_constant");
@@ -783,7 +826,16 @@ main (int argc, char *argv[])
          else
                  GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","udp","symmetric");
   }
-  if (is_http == GNUNET_YES)
+  else if (is_unix == GNUNET_YES)
+  {
+          if (is_asymmetric_recv_constant == GNUNET_YES)
+                  GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","unix","asymmetric_recv_constant");
+          else if (is_asymmetric_send_constant == GNUNET_YES)
+                  GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","unix","asymmetric_send_constant");
+          else
+                  GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","unix","symmetric");
+  }
+  else if (is_http == GNUNET_YES)
   {
          if (is_asymmetric_recv_constant == GNUNET_YES)
                  GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","http","asymmetric_recv_constant");
@@ -792,7 +844,7 @@ main (int argc, char *argv[])
          else
                  GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","http","symmetric");
   }
-  if (is_https == GNUNET_YES)
+  else if (is_https == GNUNET_YES)
   {
          if (is_asymmetric_recv_constant == GNUNET_YES)
                  GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","https","asymmetric_recv_constant");
@@ -801,6 +853,10 @@ main (int argc, char *argv[])
          else
                  GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","https","symmetric");
   }
+  else
+  {
+         GNUNET_asprintf(&logger, "test-quota-compliance-%s-%s","noplugin","none");
+  }
 
   GNUNET_DISK_directory_remove ("/tmp/test_quota_compliance_peer1");
   GNUNET_DISK_directory_remove ("/tmp/test_quota_compliance_peer2");