safety checks

3 files changed, 24 insertions, 3 deletions

diff --git a/src/ats-tests/ats-testing-experiment.c b/src/ats-tests/ats-testing-experiment.c
index 1ab1342c5..80f30d9f0 100644
--- a/src/ats-tests/ats-testing-experiment.c
+++ b/src/ats-tests/ats-testing-experiment.c
@@ -256,6 +256,18 @@ load_episode (struct Experiment *e, struct Episode *cur,
       }
     }
 
+    /* Safety checks */
+    if ((GNUNET_ATS_TEST_TG_LINEAR == o->tg_type) ||
+        (GNUNET_ATS_TEST_TG_SINUS == o->tg_type))
+    {
+      if ((o->max_rate - o->base_rate) > o->base_rate)
+      {
+        /* This will cause an underflow */
+        GNUNET_break (0);
+      }
+      fprintf (stderr, "Selected max rate and base rate cannot be used for desired traffic form!\n");
+    }
+
     fprintf (stderr, "Found operation %u in episode %u: %s [%llu]->[%llu] == %s, %llu -> %llu in %s\n",
         op_counter, cur->id, print_op (o->type), o->src_id,
         o->dest_id, type, o->base_rate, o->max_rate,
diff --git a/src/ats-tests/ats-testing-traffic.c b/src/ats-tests/ats-testing-traffic.c
index 1bd31cc26..0938f79f4 100644
--- a/src/ats-tests/ats-testing-traffic.c
+++ b/src/ats-tests/ats-testing-traffic.c
@@ -54,9 +54,13 @@ get_delay (struct TrafficGenerator *tg)
       time_delta = GNUNET_TIME_absolute_get_duration(tg->time_start);
       /* Calculate point of time in the current period */
       time_delta.rel_value_us = time_delta.rel_value_us % tg->duration_period.rel_value_us;
-
       delta_rate = ((double) time_delta.rel_value_us  / tg->duration_period.rel_value_us) *
           (tg->max_rate - tg->base_rate);
+      if ((tg->max_rate - tg->base_rate) > tg->base_rate)
+      {
+        /* This will cause an underflow */
+        GNUNET_break (0);
+      }
       cur_rate = tg->base_rate + delta_rate;
       break;
     case GNUNET_ATS_TEST_TG_RANDOM:
@@ -67,7 +71,7 @@ get_delay (struct TrafficGenerator *tg)
       time_delta = GNUNET_TIME_absolute_get_duration(tg->time_start);
       /* Calculate point of time in the current period */
       time_delta.rel_value_us = time_delta.rel_value_us % tg->duration_period.rel_value_us;
-      if ((tg->max_rate - tg->base_rate) < tg->base_rate)
+      if ((tg->max_rate - tg->base_rate) > tg->base_rate)
       {
         /* This will cause an underflow for second half of sinus period,
          * will be detected in general when experiments are loaded */
@@ -82,6 +86,11 @@ get_delay (struct TrafficGenerator *tg)
       break;
   }
 
+  if (cur_rate < 0)
+  {
+    cur_rate = 0;
+  }
+
   /* Calculate the delay for the next message based on the current delay  */
   delay.rel_value_us =  GNUNET_TIME_UNIT_SECONDS.rel_value_us * TEST_MESSAGE_SIZE / cur_rate;
 
diff --git a/src/ats-tests/experiments/test.exp b/src/ats-tests/experiments/test.exp
index 3ecfc63d4..b70cb7550 100644
--- a/src/ats-tests/experiments/test.exp
+++ b/src/ats-tests/experiments/test.exp
@@ -21,7 +21,7 @@ op-1-dest = 2
 op-1-type = sinus
 op-1-period = 1 s
 op-1-base-rate= 10000
-op-1-max-rate = 20000
+op-1-max-rate = 15000
 
 op-2-operation = set_rate
 op-2-src = 0