diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-04-27 20:25:46 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-04-27 20:25:46 +0000 |
commit | b8fbe0e5afeb7995a919061788161d9ce5d9b099 (patch) | |
tree | b62dda6e1f793400c4f2ca03c4b4a886b3f08df1 /src | |
parent | fc3809cc87d923552bc1c8ba20008f08174ad84d (diff) | |
download | gnunet-b8fbe0e5afeb7995a919061788161d9ce5d9b099.tar.gz gnunet-b8fbe0e5afeb7995a919061788161d9ce5d9b099.zip |
fix
Diffstat (limited to 'src')
-rw-r--r-- | src/fs/fs.c | 1 | ||||
-rw-r--r-- | src/fs/fs_download.c | 4 | ||||
-rw-r--r-- | src/fs/fs_test_lib_data.conf | 4 | ||||
-rw-r--r-- | src/fs/test_gnunet_service_fs_p2p.c | 2 |
4 files changed, 6 insertions, 5 deletions
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 @@ | |||
40 | static void | 40 | static void |
41 | start_job (struct GNUNET_FS_QueueEntry *qe) | 41 | start_job (struct GNUNET_FS_QueueEntry *qe) |
42 | { | 42 | { |
43 | GNUNET_assert (NULL == qe->client); | ||
43 | qe->client = GNUNET_CLIENT_connect ("fs", qe->h->cfg); | 44 | qe->client = GNUNET_CLIENT_connect ("fs", qe->h->cfg); |
44 | if (qe->client == NULL) | 45 | if (qe->client == NULL) |
45 | { | 46 | { |
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, | |||
1600 | GNUNET_TIME_UNIT_FOREVER_REL); | 1600 | GNUNET_TIME_UNIT_FOREVER_REL); |
1601 | pi.status = GNUNET_FS_STATUS_DOWNLOAD_ACTIVE; | 1601 | pi.status = GNUNET_FS_STATUS_DOWNLOAD_ACTIVE; |
1602 | GNUNET_FS_download_make_status_ (&pi, dc); | 1602 | GNUNET_FS_download_make_status_ (&pi, dc); |
1603 | GNUNET_assert (dc->pending_head == NULL); | 1603 | dc->pending_head = NULL; |
1604 | GNUNET_assert (dc->pending_tail == NULL); | 1604 | dc->pending_tail = NULL; |
1605 | GNUNET_CONTAINER_multihashmap_iterate (dc->active, | 1605 | GNUNET_CONTAINER_multihashmap_iterate (dc->active, |
1606 | &retry_entry, | 1606 | &retry_entry, |
1607 | dc); | 1607 | 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 | |||
20 | DEFAULTSERVICES = fs | 20 | DEFAULTSERVICES = fs |
21 | 21 | ||
22 | [datastore] | 22 | [datastore] |
23 | # DEBUG = YES | 23 | DEBUG = YES |
24 | #PREFIX = valgrind --tool=memcheck --leak-check=yes | 24 | #PREFIX = valgrind --tool=memcheck --leak-check=yes |
25 | QUOTA = 2000000000 | 25 | QUOTA = 2000000000 |
26 | 26 | ||
@@ -53,7 +53,7 @@ HOSTNAME = localhost | |||
53 | #OPTIONS = -L DEBUG | 53 | #OPTIONS = -L DEBUG |
54 | CONTENT_CACHING = NO | 54 | CONTENT_CACHING = NO |
55 | CONTENT_PUSHING = NO | 55 | CONTENT_PUSHING = NO |
56 | # DEBUG = YES | 56 | DEBUG = YES |
57 | # PREFIX = valgrind --tool=memcheck --leak-check=yes --trace-children=yes | 57 | # PREFIX = valgrind --tool=memcheck --leak-check=yes --trace-children=yes |
58 | #BINARY = /home/grothoff/gn9/bin/gnunet-service-fs | 58 | #BINARY = /home/grothoff/gn9/bin/gnunet-service-fs |
59 | #PREFIX = xterm -e gdb -x cmd --args | 59 | #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 @@ | |||
36 | /** | 36 | /** |
37 | * How long until we give up on the download? | 37 | * How long until we give up on the download? |
38 | */ | 38 | */ |
39 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60) | 39 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300) |
40 | 40 | ||
41 | #define NUM_DAEMONS 2 | 41 | #define NUM_DAEMONS 2 |
42 | 42 | ||