diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-02-27 10:52:09 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-02-27 10:52:09 +0000 |
commit | 938a31dcf378460d4684a708e6d42bc32095dcee (patch) | |
tree | dba85997f7f85e5a63b43a62de874083f0c32283 /src/fs | |
parent | e4f81a9c9600482ee71e52d8dab6775d56d4d2c6 (diff) | |
download | gnunet-938a31dcf378460d4684a708e6d42bc32095dcee.tar.gz gnunet-938a31dcf378460d4684a708e6d42bc32095dcee.zip |
fixes
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/fs_test_lib_data.conf | 4 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs.c | 12 | ||||
-rw-r--r-- | src/fs/test_fs_download_data.conf | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf index d62ee8c98..23cb948c4 100644 --- a/src/fs/fs_test_lib_data.conf +++ b/src/fs/fs_test_lib_data.conf | |||
@@ -12,7 +12,7 @@ HOSTNAME = localhost | |||
12 | [transport] | 12 | [transport] |
13 | PORT = 43465 | 13 | PORT = 43465 |
14 | PLUGINS = tcp | 14 | PLUGINS = tcp |
15 | DEBUG = YES | 15 | #DEBUG = YES |
16 | 16 | ||
17 | [arm] | 17 | [arm] |
18 | PORT = 43466 | 18 | PORT = 43466 |
@@ -40,7 +40,7 @@ PORT = 43470 | |||
40 | HOSTNAME = localhost | 40 | HOSTNAME = localhost |
41 | #TOTAL_QUOTA_IN = 3932160 | 41 | #TOTAL_QUOTA_IN = 3932160 |
42 | #TOTAL_QUOTA_OUT = 3932160 | 42 | #TOTAL_QUOTA_OUT = 3932160 |
43 | DEBUG = YES | 43 | #DEBUG = YES |
44 | 44 | ||
45 | [fs] | 45 | [fs] |
46 | PORT = 43471 | 46 | PORT = 43471 |
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c index 6fa18a4c3..07852b4ba 100644 --- a/src/fs/gnunet-service-fs.c +++ b/src/fs/gnunet-service-fs.c | |||
@@ -618,7 +618,6 @@ destroy_pending_message (struct PendingMessage *pm, | |||
618 | } | 618 | } |
619 | 619 | ||
620 | 620 | ||
621 | |||
622 | /** | 621 | /** |
623 | * We're done processing a particular request. | 622 | * We're done processing a particular request. |
624 | * Free all associated resources. | 623 | * Free all associated resources. |
@@ -1258,7 +1257,7 @@ target_reservation_cb (void *cls, | |||
1258 | { | 1257 | { |
1259 | if (pr->cp == NULL) | 1258 | if (pr->cp == NULL) |
1260 | { | 1259 | { |
1261 | #if DEBUG_FS | 1260 | #if DEBUG_FS > 1 |
1262 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1261 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1263 | "Failed to reserve bandwidth for reply (got %d/%u bytes only)!\n", | 1262 | "Failed to reserve bandwidth for reply (got %d/%u bytes only)!\n", |
1264 | amount, | 1263 | amount, |
@@ -1712,7 +1711,10 @@ process_reply (void *cls, | |||
1712 | destroy_pending_message_list_entry (pr->pending_head); | 1711 | destroy_pending_message_list_entry (pr->pending_head); |
1713 | if (pr->drq != NULL) | 1712 | if (pr->drq != NULL) |
1714 | { | 1713 | { |
1715 | GNUNET_FS_drq_get_cancel (pr->drq); | 1714 | if (pr->client_request_list != NULL) |
1715 | GNUNET_SERVER_receive_done (pr->client_request_list->client_list->client, | ||
1716 | GNUNET_YES); | ||
1717 | GNUNET_FS_drq_get_cancel (pr->drq); | ||
1716 | pr->drq = NULL; | 1718 | pr->drq = NULL; |
1717 | } | 1719 | } |
1718 | do_remove = GNUNET_YES; | 1720 | do_remove = GNUNET_YES; |
@@ -2048,7 +2050,7 @@ process_local_reply (void *cls, | |||
2048 | (pr->results_found > 5 + 2 * pr->priority) ) ) || | 2050 | (pr->results_found > 5 + 2 * pr->priority) ) ) || |
2049 | (type == GNUNET_DATASTORE_BLOCKTYPE_DBLOCK) ) | 2051 | (type == GNUNET_DATASTORE_BLOCKTYPE_DBLOCK) ) |
2050 | { | 2052 | { |
2051 | #if DEBUG_FS | 2053 | #if DEBUG_FS > 2 |
2052 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2054 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2053 | "Unique reply found or load too high, done with request\n"); | 2055 | "Unique reply found or load too high, done with request\n"); |
2054 | #endif | 2056 | #endif |
@@ -2433,7 +2435,7 @@ handle_start_search (void *cls, | |||
2433 | uint16_t msize; | 2435 | uint16_t msize; |
2434 | unsigned int sc; | 2436 | unsigned int sc; |
2435 | uint32_t type; | 2437 | uint32_t type; |
2436 | 2438 | ||
2437 | msize = ntohs (message->size); | 2439 | msize = ntohs (message->size); |
2438 | if ( (msize < sizeof (struct SearchMessage)) || | 2440 | if ( (msize < sizeof (struct SearchMessage)) || |
2439 | (0 != (msize - sizeof (struct SearchMessage)) % sizeof (GNUNET_HashCode)) ) | 2441 | (0 != (msize - sizeof (struct SearchMessage)) % sizeof (GNUNET_HashCode)) ) |
diff --git a/src/fs/test_fs_download_data.conf b/src/fs/test_fs_download_data.conf index d61eaca37..6c14de879 100644 --- a/src/fs/test_fs_download_data.conf +++ b/src/fs/test_fs_download_data.conf | |||
@@ -19,7 +19,7 @@ HOSTNAME = localhost | |||
19 | DEFAULTSERVICES = resolver datastore transport core fs | 19 | DEFAULTSERVICES = resolver datastore transport core fs |
20 | 20 | ||
21 | [datastore] | 21 | [datastore] |
22 | #DEBUG = YES | 22 | DEBUG = YES |
23 | 23 | ||
24 | [statistics] | 24 | [statistics] |
25 | PORT = 42467 | 25 | PORT = 42467 |