fix

diff --git a/src/fs/fs.c b/src/fs/fs.c
index 81250b88c4403c6f0d4d7f5cabedb3e679fc3a14..307952a17bce0221e8c8a5b74a6efa5cec5aef90 100644 (file)
--- a/src/fs/fs.c
+++ b/src/fs/fs.c
@@ -40,6 +40,7 @@
 static void
 start_job (struct GNUNET_FS_QueueEntry *qe)
 {
+  GNUNET_assert (NULL == qe->client);
   qe->client = GNUNET_CLIENT_connect ("fs", qe->h->cfg);
   if (qe->client == NULL)
     {

diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c
index 8eb2b433139fb636d4dfb64dd39f5e3a4eb016ae..732b3c43af537dddb8a2cdbd51afb129fc08deac 100644 (file)
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -1600,8 +1600,8 @@ activate_fs_download (void *cls,
                         GNUNET_TIME_UNIT_FOREVER_REL);
   pi.status = GNUNET_FS_STATUS_DOWNLOAD_ACTIVE;
   GNUNET_FS_download_make_status_ (&pi, dc);
-  GNUNET_assert (dc->pending_head == NULL);
-  GNUNET_assert (dc->pending_tail == NULL);
+  dc->pending_head = NULL;
+  dc->pending_tail = NULL;
   GNUNET_CONTAINER_multihashmap_iterate (dc->active,
                                         &retry_entry,
                                         dc);

diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf
index 204bb90cf271f2479bcbc3a540742d287999f7c6..7a65768750bd10323ff704720836f834f05be221 100644 (file)
--- a/src/fs/fs_test_lib_data.conf
+++ b/src/fs/fs_test_lib_data.conf
@@ -20,7 +20,7 @@ HOSTNAME = localhost
 DEFAULTSERVICES = fs
 
 [datastore]
-# DEBUG = YES
+DEBUG = YES
 #PREFIX = valgrind --tool=memcheck --leak-check=yes
 QUOTA = 2000000000
 
@@ -53,7 +53,7 @@ HOSTNAME = localhost
 #OPTIONS = -L DEBUG
 CONTENT_CACHING = NO
 CONTENT_PUSHING = NO
-# DEBUG = YES
+DEBUG = YES
 # PREFIX = valgrind --tool=memcheck --leak-check=yes --trace-children=yes
 #BINARY = /home/grothoff/gn9/bin/gnunet-service-fs
 #PREFIX = xterm -e gdb -x cmd --args 

diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c
index 91cfda0eb2ccbdb4d24c38cd2eaa7f790709a396..ecab7739600216bd119aaaa8248f712e1e5b491e 100644 (file)
--- a/src/fs/test_gnunet_service_fs_p2p.c
+++ b/src/fs/test_gnunet_service_fs_p2p.c
@@ -36,7 +36,7 @@
 /**
  * How long until we give up on the download?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
 
 #define NUM_DAEMONS 2