fixs for crash while adding slaves with id greater than 9

diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index 42a15c627bcb6a1295965cc3f018608506f48dd2..4b05eb37888f394799f419d835ae1befd96cf9cd 100644 (file)
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -996,13 +996,16 @@ route_list_add (struct Route *route)
 static void
 slave_list_add (struct Slave *slave)
 {
+  uint32_t orig_size;
+
+  orig_size = slave_list_size;  
   if (slave->host_id >= slave_list_size)
   {
+    while (slave->host_id >= slave_list_size)
+      slave_list_size += LIST_GROW_STEP;
     slave_list =
-        TESTBED_realloc (slave_list, sizeof (struct Slave *) * slave_list_size,
-                         sizeof (struct Slave *) * (slave_list_size +
-                                                    LIST_GROW_STEP));
-    slave_list_size += LIST_GROW_STEP;
+        TESTBED_realloc (slave_list, sizeof (struct Slave *) * orig_size,
+                         sizeof (struct Slave *) * slave_list_size);
   }
   GNUNET_assert (NULL == slave_list[slave->host_id]);
   slave_list[slave->host_id] = slave;

diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
index 7b42188902f2c31894374aa71e030968c6409d61..fd4f3885eaa6a3b935202a0a1f665683b72f2d18 100644 (file)
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -452,13 +452,16 @@ controller_event_cb (void *cls,
         static unsigned int established_links;
 
        if (0 == established_links)
-         printf ("Establishing links\n");
+         printf ("Establishing links\n .");
        else
+       {
          printf (".");
+         fflush (stdout);
+       }
         if (++established_links == num_links)
         {
           prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time);
-          printf ("%u links established in %.2f seconds\n",
+          printf ("\n%u links established in %.2f seconds\n",
                   num_links, ((double) prof_time.rel_value) / 1000.00);
          result = GNUNET_OK;
           GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);