[GNUnet-SVN] r10467 - gnunet/src/testing

[gnunet]

Author: grothoff
Date: 2010-03-04 09:20:56 +0100 (Thu, 04 Mar 2010)
New Revision: 10467

Modified:
   gnunet/src/testing/testing_group.c
Log:
use utils rand functions

Modified: gnunet/src/testing/testing_group.c
===================================================================
--- gnunet/src/testing/testing_group.c  2010-03-03 15:15:50 UTC (rev 10466)
+++ gnunet/src/testing/testing_group.c  2010-03-04 08:20:56 UTC (rev 10467)
@@ -330,8 +330,6 @@
   if (connsPerPeer % 2 == 1)
     connsPerPeer += 1;
 
-  time = GNUNET_TIME_absolute_get ();
-  srand ((unsigned int) time.value);
   smallWorldConnections = 0;
   connect_attempts = 0;
   for (i = 0; i < pg->total; i++)
@@ -354,7 +352,8 @@
 
       for (j = 0; j < connsPerPeer / 2; j++)
         {
-          random = ((double) rand () / RAND_MAX);
+          random = ((double) 
GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_WEAK,
+                                                     (uint64_t)-1LL)) / ( 
(double) (uint64_t) -1LL);
           if (random < percentage)
             {
               /* Connect to uniformly selected random peer */
@@ -540,8 +539,9 @@
                 {
                   /* Calculate probability as 1 over the square of the 
distance */
                   probability = 1.0 / (distance * distance);
-                  /* Choose a random, divide by RAND_MAX to get a number 
between 0 and 1 */
-                  random = ((double) rand () / RAND_MAX);
+                  /* Choose a random value between 0 and 1 */
+                 random = ((double) 
GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_WEAK,
+                                                             (uint64_t)-1LL)) 
/ ( (double) (uint64_t) -1LL);
                   /* If random < probability, then connect the two nodes */
                   if (random < probability)
                     smallWorldConnections += add_connections (pg, j, k);
@@ -582,7 +582,8 @@
       for (inner_count = outer_count + 1; inner_count < pg->total;
            inner_count++)
         {
-          temp_rand = ((double) RANDOM () / RAND_MAX);
+          temp_rand = ((double) 
GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_WEAK,
+                                                        (uint64_t)-1LL)) / ( 
(double) (uint64_t) -1LL);
 #if VERBOSE_TESTING
           GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                       _("rand is %f probability is %f\n"), temp_rand,