From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 27 Apr 2011 20:25:46 +0000 (+0000)
Subject: fix
X-Git-Tag: initial-import-from-subversion-38251~18601
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b8fbe0e5afeb7995a919061788161d9ce5d9b099;p=oweals%2Fgnunet.git

fix
---

diff --git a/src/fs/fs.c b/src/fs/fs.c
index 81250b88c..307952a17 100644
--- 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 8eb2b4331..732b3c43a 100644
--- 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 204bb90cf..7a6576875 100644
--- 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 91cfda0eb..ecab77396 100644
--- 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