[GNUnet-SVN] r11749 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2010-06-14 20:55:25 +0200 (Mon, 14 Jun 2010)
New Revision: 11749

Modified:
   gnunet/src/fs/fs_test_lib.c
   gnunet/src/fs/test_gnunet_service_fs_migration.c
Log:
fix

Modified: gnunet/src/fs/fs_test_lib.c
===================================================================
--- gnunet/src/fs/fs_test_lib.c 2010-06-14 18:30:49 UTC (rev 11748)
+++ gnunet/src/fs/fs_test_lib.c 2010-06-14 18:55:25 UTC (rev 11749)
@@ -228,7 +228,6 @@
 }
 
 
-
 struct StartContext
 {
   struct GNUNET_SCHEDULER_Handle *sched;
@@ -253,7 +252,6 @@
 {
   struct StartContext *sctx = cls;
   unsigned int i;
-  unsigned long long fsport;
 
   if (emsg != NULL)
     {
@@ -262,11 +260,21 @@
                  emsg);
       return;
     }
+  i = 0;
+  while (i < sctx->total)
+    {
+      if (GNUNET_TESTING_daemon_get (sctx->group,
+                                    i) == d)
+       break;
+      i++;
+    }
+  GNUNET_assert (i < sctx->total);
   GNUNET_assert (sctx->have < sctx->total);
-  sctx->daemons[sctx->have]->cfg = GNUNET_CONFIGURATION_dup (cfg);
-  sctx->daemons[sctx->have]->group = sctx->group;
-  sctx->daemons[sctx->have]->daemon = d;
-  sctx->daemons[sctx->have]->id = *id;
+  GNUNET_assert (sctx->daemons[i]->cfg == NULL);
+  sctx->daemons[i]->cfg = GNUNET_CONFIGURATION_dup (cfg);
+  sctx->daemons[i]->group = sctx->group;
+  sctx->daemons[i]->daemon = d;
+  sctx->daemons[i]->id = *id;
   sctx->have++;
   if (sctx->have == sctx->total)
     {
@@ -279,16 +287,6 @@
                               sctx->timeout_task);
       for (i=0;i<sctx->total;i++)
        {
-         fsport = 0;
-         GNUNET_break (GNUNET_OK ==
-                       GNUNET_CONFIGURATION_get_value_number 
(sctx->daemons[i]->cfg,
-                                                              "fs",
-                                                              "PORT",
-                                                              &fsport));
-         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                     _("Testing connects to port %llu for peer %u\n"),
-                     fsport,
-                     i);                       
          sctx->daemons[i]->fs = GNUNET_FS_start (sctx->sched,
                                                  sctx->daemons[i]->cfg,
                                                  "<tester>",

Modified: gnunet/src/fs/test_gnunet_service_fs_migration.c
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_migration.c    2010-06-14 18:30:49 UTC 
(rev 11748)
+++ gnunet/src/fs/test_gnunet_service_fs_migration.c    2010-06-14 18:55:25 UTC 
(rev 11749)
@@ -159,7 +159,6 @@
 }
 
 
-
 static void
 do_publish (void *cls,
            const struct GNUNET_SCHEDULER_TaskContext *tc)