diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-11-25 12:32:59 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-11-25 12:32:59 +0000 |
commit | c633b8eb2291d0327cfd5960b5f31d0df7525f07 (patch) | |
tree | 4cf74b0fe4e483191d2ee06deb1902d118223dd3 /src/fs/gnunet-service-fs_pr.c | |
parent | aa3fe66f2aab8098491304d7083426c579c2cd4d (diff) | |
download | gnunet-c633b8eb2291d0327cfd5960b5f31d0df7525f07.tar.gz gnunet-c633b8eb2291d0327cfd5960b5f31d0df7525f07.zip |
-enable mesh, as stream needs it, activate testcase
Diffstat (limited to 'src/fs/gnunet-service-fs_pr.c')
-rw-r--r-- | src/fs/gnunet-service-fs_pr.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c index 6acc0e2bf..ecd841808 100644 --- a/src/fs/gnunet-service-fs_pr.c +++ b/src/fs/gnunet-service-fs_pr.c | |||
@@ -1175,11 +1175,23 @@ stream_reply_proc (void *cls, | |||
1175 | struct GNUNET_HashCode query; | 1175 | struct GNUNET_HashCode query; |
1176 | 1176 | ||
1177 | pr->stream_request = NULL; | 1177 | pr->stream_request = NULL; |
1178 | if (GNUNET_BLOCK_TYPE_ANY == type) | ||
1179 | { | ||
1180 | GNUNET_break (NULL == data); | ||
1181 | GNUNET_break (0 == data_size); | ||
1182 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1183 | "Error retrieiving block via stream\n"); | ||
1184 | /* FIXME: should re-try a few times... */ | ||
1185 | return; | ||
1186 | } | ||
1178 | if (GNUNET_YES != | 1187 | if (GNUNET_YES != |
1179 | GNUNET_BLOCK_get_key (GSF_block_ctx, | 1188 | GNUNET_BLOCK_get_key (GSF_block_ctx, |
1180 | type, | 1189 | type, |
1181 | data, data_size, &query)) | 1190 | data, data_size, &query)) |
1182 | { | 1191 | { |
1192 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1193 | "Failed to derive key for block of type %d\n", | ||
1194 | (int) type); | ||
1183 | GNUNET_break_op (0); | 1195 | GNUNET_break_op (0); |
1184 | return; | 1196 | return; |
1185 | } | 1197 | } |
@@ -1209,7 +1221,11 @@ GSF_stream_lookup_ (struct GSF_PendingRequest *pr) | |||
1209 | if (0 != pr->public_data.anonymity_level) | 1221 | if (0 != pr->public_data.anonymity_level) |
1210 | return; | 1222 | return; |
1211 | if (0 == pr->public_data.target) | 1223 | if (0 == pr->public_data.target) |
1224 | { | ||
1225 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1226 | "Cannot do stream-based download, target peer not known\n"); | ||
1212 | return; | 1227 | return; |
1228 | } | ||
1213 | if (NULL != pr->stream_request) | 1229 | if (NULL != pr->stream_request) |
1214 | return; | 1230 | return; |
1215 | pr->stream_request = GSF_stream_query (pr->public_data.target, | 1231 | pr->stream_request = GSF_stream_query (pr->public_data.target, |