[GNUnet-SVN] r21559 - gnunet/src/ats

[gnunet]

Author: wachs
Date: 2012-05-22 13:27:03 +0200 (Tue, 22 May 2012)
New Revision: 21559

Modified:
   gnunet/src/ats/test_ats_api_reset_backoff.c
Log:
- changes


Modified: gnunet/src/ats/test_ats_api_reset_backoff.c
===================================================================
--- gnunet/src/ats/test_ats_api_reset_backoff.c 2012-05-22 09:57:18 UTC (rev 
21558)
+++ gnunet/src/ats/test_ats_api_reset_backoff.c 2012-05-22 11:27:03 UTC (rev 
21559)
@@ -28,7 +28,7 @@
 #include "ats.h"
 
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
-#define ATS_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
+#define ATS_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_MILLISECONDS, 90)
 
 static GNUNET_SCHEDULER_TaskIdentifier die_task;
 
@@ -130,25 +130,16 @@
   suggest_timeout_task = GNUNET_SCHEDULER_NO_TASK;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Requesting address for peer timed 
out\n");
-}
 
-static void request_address ()
-{
-
-  if (suggest_timeout_task != GNUNET_SCHEDULER_NO_TASK)
+  if (die_task != GNUNET_SCHEDULER_NO_TASK)
   {
-    GNUNET_SCHEDULER_cancel (suggest_timeout_task);
-    suggest_timeout_task = GNUNET_SCHEDULER_NO_TASK;
+    GNUNET_SCHEDULER_cancel (die_task);
+    die_task = GNUNET_SCHEDULER_NO_TASK;
   }
 
-  suggest_timeout_task = 
GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_MINUTES, &suggest_timeout, NULL);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Requesting address for peer `%s'\n",
-              GNUNET_i2s (&peer.id));
-  GNUNET_ATS_suggest_address (ats, &peer.id);
+  die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
 }
 
-
 static void
 address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *a,
                     struct Session *session,
@@ -236,14 +227,9 @@
     GNUNET_SCHEDULER_cancel (suggest_timeout_task);
     suggest_timeout_task = GNUNET_SCHEDULER_NO_TASK;
   }
-
-  GNUNET_ATS_reset_backoff(ats, &a->peer);
-  request_address ();
+  suggest_timeout_task = GNUNET_SCHEDULER_add_delayed(ATS_TIMEOUT, 
&suggest_timeout, NULL);
 }
 
-
-
-
 void
 start_arm (const char *cfgname)
 {
@@ -289,7 +275,13 @@
   hello_addr.address_length = address.addr_len;
   GNUNET_ATS_address_update (ats, &hello_addr, address.session, NULL, 0);
 
-  request_address ();
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Requesting address for peer `%s'\n",
+              GNUNET_i2s (&peer.id));
+  /* Increase block timout far beyond ATS_TIMEOUT */
+  GNUNET_ATS_suggest_address (ats, &peer.id);
+
+  GNUNET_ATS_reset_backoff(ats, &peer.id);
+  GNUNET_ATS_suggest_address (ats, &peer.id);
 }
 
 int