[GNUnet-SVN] r24950 - gnunet/src/dht

[gnunet]

Author: grothoff
Date: 2012-11-14 14:03:21 +0100 (Wed, 14 Nov 2012)
New Revision: 24950

Modified:
   gnunet/src/dht/gnunet-service-dht_clients.c
Log:
use exp backoff macro, start with retry frequency of 1s, instead of the insane 
1ms

Modified: gnunet/src/dht/gnunet-service-dht_clients.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht_clients.c 2012-11-14 12:28:36 UTC (rev 
24949)
+++ gnunet/src/dht/gnunet-service-dht_clients.c 2012-11-14 13:03:21 UTC (rev 
24950)
@@ -423,10 +423,7 @@
   GNUNET_CONTAINER_bloomfilter_free (peer_bf);
 
   /* exponential back-off for retries, max 1h */
-  cqr->retry_frequency =
-      GNUNET_TIME_relative_min (GNUNET_TIME_UNIT_HOURS,
-                                GNUNET_TIME_relative_multiply
-                                (cqr->retry_frequency, 2));
+  cqr->retry_frequency = GNUNET_TIME_STD_BACKOFF (cqr->retry_frequency);
   cqr->retry_time = GNUNET_TIME_relative_to_absolute (cqr->retry_frequency);
 }
 
@@ -590,7 +587,7 @@
   cqr->xquery = (void *) &cqr[1];
   memcpy (&cqr[1], xquery, xquery_size);
   cqr->hnode = GNUNET_CONTAINER_heap_insert (retry_heap, cqr, 0);
-  cqr->retry_frequency = GNUNET_TIME_UNIT_MILLISECONDS;
+  cqr->retry_frequency = GNUNET_TIME_UNIT_SECONDS;
   cqr->retry_time = GNUNET_TIME_absolute_get ();
   cqr->unique_id = get->unique_id;
   cqr->xquery_size = xquery_size;