X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2Ftest_ats_simplistic_change_preference.c;h=d5dbe9f9ac36d688f7d4862e8af50a806f967dff;hb=056f559d916d785164f40e63ca56c153ea0e9ebe;hp=f004385d18c2424eb980bb5933d1bb54aab86f12;hpb=33a5d276ff045e45d05264a0c17a545ecd277548;p=oweals%2Fgnunet.git

diff --git a/src/ats/test_ats_simplistic_change_preference.c b/src/ats/test_ats_simplistic_change_preference.c
index f004385d1..d5dbe9f9a 100644
--- a/src/ats/test_ats_simplistic_change_preference.c
+++ b/src/ats/test_ats_simplistic_change_preference.c
@@ -26,7 +26,7 @@
  */
 /**
  * @file ats/test_ats_simplistic_change_preference.c
- * @brief test for changing preferences in ats simplistic solver
+ * @brief test for changing preferences in ats proportional solver
  * @author Christian Grothoff
  * @author Matthias Wachs
  */
@@ -38,6 +38,8 @@
 
 #define DEBUG_ATS_INFO GNUNET_NO
 
+#define SLEEP GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+
 static GNUNET_SCHEDULER_TaskIdentifier die_task;
 
 /**
@@ -144,20 +146,23 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
   {
     if (GNUNET_OK == compare_addresses (address, session, &test_hello_address[0], test_session[0]))
     {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 0: Callback with correct address `%s'\n",
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage %u: Callback with correct address `%s'\n",
+                    stage,
                     GNUNET_i2s (&address->peer));
         ret = 0;
     }
     else
     {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 0: Callback with invalid address `%s'\n",
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage %u: Callback with invalid address `%s'\n",
+            stage,
                     GNUNET_i2s (&address->peer));
         ret = 1;
     }
 
     if (GNUNET_OK != compare_ats(atsi, ats_count, test_ats_info, test_ats_count))
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage 0: Callback with incorrect ats info \n");
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: Callback with incorrect ats info \n",
+          stage);
       ret = 1;
     }
 
@@ -191,11 +196,74 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
     stage ++;
 
     GNUNET_ATS_suggest_address_cancel (sched_ats, &p[0].id);
+    GNUNET_ATS_suggest_address (sched_ats, &p[1].id);
+    return;
+  }
+  if (1 == stage)
+  {
+    if (GNUNET_OK == compare_addresses (address, session, &test_hello_address[1], test_session[1]))
+    {
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage %u: Callback with correct address `%s'\n",
+                    stage,
+                    GNUNET_i2s (&address->peer));
+        ret = 0;
+    }
+    else
+    {
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage %u: Callback with invalid address `%s'\n",
+                    stage,
+                    GNUNET_i2s (&address->peer));
+        ret = 1;
+    }
+
+    if (GNUNET_OK != compare_ats(atsi, ats_count, test_ats_info, test_ats_count))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: Callback with incorrect ats info \n",
+          stage);
+      ret = 1;
+    }
+
+    if (bw_in > wan_quota_in)
+    {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggested WAN inbound quota %u bigger than allowed quota %llu \n",
+            bw_in, wan_quota_in);
+        ret = 1;
+    }
+    else
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Suggested WAN inbound quota %u, allowed quota %llu \n",
+          bw_in, wan_quota_in);
+
+    if (bw_out > wan_quota_out)
+    {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggested WAN outbound quota %u bigger than allowed quota %llu \n",
+            bw_out, wan_quota_out);
+        ret = 1;
+    }
+    else
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Suggested WAN outbound quota %u, allowed quota %llu \n",
+          bw_out, wan_quota_out);
+
+    if (1 == ret)
+    {
+      GNUNET_ATS_suggest_address_cancel (sched_ats, &p[0].id);
+      GNUNET_SCHEDULER_add_now (&end, NULL);
+      return;
+    }
+
+    stage ++;
+    GNUNET_ATS_suggest_address_cancel (sched_ats, &p[1].id);
     GNUNET_SCHEDULER_add_now (&end, NULL);
+
     return;
   }
 }
 
+static void
+sleep_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_ATS_suggest_address (sched_ats, &p[0].id);
+}
+
 static void
 run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *cfg,
@@ -316,23 +384,23 @@ run (void *cls,
 
 
   /* Change bandwidth preference */
-  GNUNET_ATS_change_preference (perf_ats,
+  GNUNET_ATS_performance_change_preference (perf_ats,
       &p[0].id,
       GNUNET_ATS_PREFERENCE_BANDWIDTH,(double) 1000, GNUNET_ATS_PREFERENCE_END);
-  GNUNET_ATS_change_preference (perf_ats,
+  GNUNET_ATS_performance_change_preference (perf_ats,
       &p[1].id,
       GNUNET_ATS_PREFERENCE_BANDWIDTH,(double) 1000, GNUNET_ATS_PREFERENCE_END);
 
 
   /* Change latency preference */
 
-  GNUNET_ATS_change_preference (perf_ats,
+  GNUNET_ATS_performance_change_preference (perf_ats,
       &p[0].id,
       GNUNET_ATS_PREFERENCE_LATENCY,(double) 10, GNUNET_ATS_PREFERENCE_END);
-  GNUNET_ATS_change_preference (perf_ats,
+  GNUNET_ATS_performance_change_preference (perf_ats,
       &p[1].id,
       GNUNET_ATS_PREFERENCE_LATENCY,(double) 100, GNUNET_ATS_PREFERENCE_END);
-  GNUNET_ATS_suggest_address (sched_ats, &p[0].id);
+  GNUNET_SCHEDULER_add_delayed (SLEEP, &sleep_task, NULL);
 }