[GNUnet-SVN] r18306 - gnunet/src/nse

[gnunet]

Author: bartpolot
Date: 2011-11-24 17:24:53 +0100 (Thu, 24 Nov 2011)
New Revision: 18306

Modified:
   gnunet/src/nse/gnunet-service-nse.c
Log:
- Same result, cleaner code

Modified: gnunet/src/nse/gnunet-service-nse.c
===================================================================
--- gnunet/src/nse/gnunet-service-nse.c 2011-11-24 16:12:38 UTC (rev 18305)
+++ gnunet/src/nse/gnunet-service-nse.c 2011-11-24 16:24:53 UTC (rev 18306)
@@ -433,15 +433,14 @@
 {
 #if USE_RANDOM_DELAYS
   struct GNUNET_TIME_Relative ret;
+  uint32_t i;
+  double d;
 
   if (matching_bits == 0)
     return GNUNET_TIME_UNIT_ZERO;
-  ret.rel_value =
-      GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
-                                (uint32_t) (1 + (get_matching_bits_delay
-                                                (matching_bits -
-                                                 1) / (double) (hop_count_max +
-                                                                1))));
+  d = get_matching_bits_delay (matching_bits - 1);
+  i = d / (double) (hop_count_max + 1);
+  ret.rel_value = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, i + 1);
   return ret;
 #else
   return GNUNET_TIME_UNIT_ZERO;