&basename))
return NULL;
GNUNET_asprintf (&ret,
- "%s%s%s%s%s%s%s%s%s",
+ "%s%s%s%s%s%s%s.dir%s%s",
basename,
DIR_SEPARATOR_STR,
h->client_name,
}
ret = GNUNET_BIO_write_open (fn);
if (ret == NULL)
- fprintf (stderr,
- "Failed to create write handle for `%s' from `%s/%s'\n",
- fn, ext, ent);
+ GNUNET_break (0);
GNUNET_free (fn);
return ret;
}
return;
}
filename = get_serialization_file_name (h, ext, ent);
- if (0 != UNLINK (filename))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
- "unlink",
- filename);
- GNUNET_free (filename);
+ if (filename != NULL)
+ {
+ if (0 != UNLINK (filename))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+ "unlink",
+ filename);
+ GNUNET_free (filename);
+ }
}
return;
}
filename = get_serialization_file_name_in_dir (h, ext, uni, ent);
- if (0 != UNLINK (filename))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
- "unlink",
- filename);
- GNUNET_free (filename);
+ if (filename != NULL)
+ {
+ if (0 != UNLINK (filename))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+ "unlink",
+ filename);
+ GNUNET_free (filename);
+ }
}
GNUNET_BIO_read_int32 (rh, &ret->anonymity)) ||
(GNUNET_OK !=
GNUNET_BIO_read_int32 (rh, &ret->priority)) )
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
switch (b)
{
case 0: /* file-insert */
if (GNUNET_OK !=
GNUNET_BIO_read_int64 (rh, &ret->data.file.file_size))
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
ret->is_directory = GNUNET_NO;
ret->data.file.do_index = GNUNET_NO;
ret->data.file.have_hash = GNUNET_NO;
goto cleanup;
if (GNUNET_OK !=
GNUNET_BIO_read (rh, "file-data", ret->data.file.reader_cls, ret->data.file.file_size))
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
}
else
{
break;
case 1: /* file-index, no hash */
if (NULL == ret->filename)
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
if (GNUNET_OK !=
GNUNET_BIO_read_int64 (rh, &ret->data.file.file_size))
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
ret->is_directory = GNUNET_NO;
ret->data.file.do_index = GNUNET_YES;
ret->data.file.have_hash = GNUNET_NO;
break;
case 2: /* file-index-with-hash */
if (NULL == ret->filename)
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
if ( (GNUNET_OK !=
GNUNET_BIO_read_int64 (rh, &ret->data.file.file_size)) ||
(GNUNET_OK !=
GNUNET_BIO_read (rh, "fileid", &ret->data.file.file_id, sizeof (GNUNET_HashCode))) )
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
ret->is_directory = GNUNET_NO;
ret->data.file.do_index = GNUNET_YES;
ret->data.file.have_hash = GNUNET_YES;
break;
case 3: /* file-index-with-hash-confirmed */
if (NULL == ret->filename)
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
if ( (GNUNET_OK !=
GNUNET_BIO_read_int64 (rh, &ret->data.file.file_size)) ||
(GNUNET_OK !=
GNUNET_BIO_read (rh, "fileid", &ret->data.file.file_id, sizeof (GNUNET_HashCode))) )
- goto cleanup;
-
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
ret->is_directory = GNUNET_NO;
ret->data.file.do_index = GNUNET_YES;
ret->data.file.have_hash = GNUNET_YES;
ret->data.file.reader_cls = GNUNET_FS_make_file_reader_context_ (ret->filename);
break;
case 4: /* directory */
+ ret->is_directory = GNUNET_YES;
if ( (GNUNET_OK !=
GNUNET_BIO_read_int32 (rh, &dsize)) ||
(NULL == (ret->data.dir.dir_data = GNUNET_malloc_large (dsize))) ||
GNUNET_BIO_read (rh, "dir-data", ret->data.dir.dir_data, dsize)) ||
(GNUNET_OK !=
GNUNET_BIO_read_string (rh, "ent-filename", &filename, 16*1024)) )
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
ret->data.dir.dir_size = (uint32_t) dsize;
- ret->is_directory = GNUNET_YES;
if (filename != NULL)
{
ret->data.dir.entries = deserialize_file_information (h, filename);
ret->serialization = GNUNET_strdup (fn);
if (GNUNET_OK !=
GNUNET_BIO_read_string (rh, "nxt-filename", &filename, 16*1024))
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
if (filename != NULL)
{
ret->next = deserialize_file_information (h, filename);
emsg);
GNUNET_free (emsg);
}
+ if (ret == NULL)
+ {
+ if (0 != UNLINK (filename))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+ "unlink",
+ filename);
+ }
return ret;
}
if (0 == (h->flags & GNUNET_FS_FLAGS_PERSISTENCE))
return NULL; /* persistence not requested */
dn = get_serialization_file_name (h, ext, "");
+ if (dn == NULL)
+ return NULL;
if (GNUNET_OK !=
GNUNET_DISK_directory_create_for_file (dn))
{
if (0 == (h->flags & GNUNET_FS_FLAGS_PERSISTENCE))
return NULL; /* persistence not requested */
dn = get_serialization_file_name_in_dir (h, ext, uni, "");
+ if (dn == NULL)
+ return NULL;
if (GNUNET_OK !=
GNUNET_DISK_directory_create_for_file (dn))
{
char buf[32 * 1024];
uint64_t off;
size_t ret;
+ size_t left;
char *emsg;
emsg = NULL;
off = 0;
while (off < fi->data.file.file_size)
{
+ left = GNUNET_MIN (sizeof(buf), fi->data.file.file_size - off);
ret = fi->data.file.reader (fi->data.file.reader_cls,
- off, sizeof (buf),
+ off, left,
buf,
&emsg);
if (ret == 0)
GNUNET_BIO_write_int32 (wh, fi->anonymity)) ||
(GNUNET_OK !=
GNUNET_BIO_write_int32 (wh, fi->priority)) )
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
GNUNET_free_non_null (chks);
chks = NULL;
GNUNET_free_non_null (ksks);
case 0: /* file-insert */
if (GNUNET_OK !=
GNUNET_BIO_write_int64 (wh, fi->data.file.file_size))
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
if ( (GNUNET_NO == fi->is_published) &&
(NULL == fi->filename) )
if (GNUNET_OK !=
copy_from_reader (wh, fi))
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
break;
case 1: /* file-index, no hash */
if (NULL == fi->filename)
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
if (GNUNET_OK !=
GNUNET_BIO_write_int64 (wh, fi->data.file.file_size))
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
break;
case 2: /* file-index-with-hash */
case 3: /* file-index-with-hash-confirmed */
if (NULL == fi->filename)
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
if ( (GNUNET_OK !=
GNUNET_BIO_write_int64 (wh, fi->data.file.file_size)) ||
(GNUNET_OK !=
GNUNET_BIO_write (wh, &fi->data.file.file_id, sizeof (GNUNET_HashCode))) )
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
break;
case 4: /* directory */
if ( (GNUNET_OK !=
(GNUNET_OK !=
GNUNET_BIO_write (wh, fi->data.dir.dir_data, (uint32_t) fi->data.dir.dir_size)) ||
(GNUNET_OK !=
- GNUNET_BIO_write_string (wh, fi->data.dir.entries->serialization)) )
- goto cleanup;
+ GNUNET_BIO_write_string (wh,
+ (fi->data.dir.entries == NULL)
+ ? NULL
+ : fi->data.dir.entries->serialization)) )
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
break;
default:
GNUNET_assert (0);
}
if (GNUNET_OK !=
GNUNET_BIO_write_string (wh, (fi->next != NULL) ? fi->next->serialization : NULL))
- goto cleanup;
- if (GNUNET_OK ==
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
+ if (GNUNET_OK !=
GNUNET_BIO_write_close (wh))
- return; /* done! */
+ {
+ wh = NULL;
+ GNUNET_break (0);
+ goto cleanup;
+ }
+ return; /* done! */
cleanup:
- (void) GNUNET_BIO_write_close (wh);
+ if (wh != NULL)
+ (void) GNUNET_BIO_write_close (wh);
GNUNET_free_non_null (chks);
GNUNET_free_non_null (ksks);
fn = get_serialization_file_name (fi->h, GNUNET_FS_SYNC_PATH_FILE_INFO, fi->serialization);
- if (0 != UNLINK (fn))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", fn);
- GNUNET_free (fn);
+ if (NULL != fn)
+ {
+ if (0 != UNLINK (fn))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", fn);
+ GNUNET_free (fn);
+ }
GNUNET_free (fi->serialization);
fi->serialization = NULL;
}
* @param uri pointer to the keywords that will be used for this entry (can be modified)
* @param anonymity pointer to selected anonymity level (can be modified)
* @param priority pointer to selected priority (can be modified)
+ * @param do_index should we index?
* @param expirationTime pointer to selected expiration time (can be modified)
* @param client_info pointer to client context set upon creation (can be modified)
* @return GNUNET_OK to continue (always)
struct GNUNET_FS_Uri **uri,
uint32_t *anonymity,
uint32_t *priority,
+ int *do_index,
struct GNUNET_TIME_Absolute *expirationTime,
void **client_info)
{
ns = NULL;
rh = GNUNET_BIO_read_open (filename);
if (rh == NULL)
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
if ( (GNUNET_OK !=
GNUNET_BIO_read_string (rh, "publish-nid", &pc->nid, 1024)) ||
(GNUNET_OK !=
GNUNET_BIO_read_string (rh, "publish-fipos", &fi_pos, 128)) ||
(GNUNET_OK !=
GNUNET_BIO_read_string (rh, "publish-ns", &ns, 1024)) )
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
pc->options = options;
pc->all_done = all_done;
pc->fi = deserialize_file_information (h, fi_root);
if (pc->fi == NULL)
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
if (ns != NULL)
{
pc->namespace = GNUNET_FS_namespace_create (h, ns);
goto cleanup;
}
}
+ if ( (0 == (pc->options & GNUNET_FS_PUBLISH_OPTION_SIMULATE_ONLY)) &&
+ (GNUNET_YES != pc->all_done) )
+ {
+ pc->dsh = GNUNET_DATASTORE_connect (h->cfg,
+ h->sched);
+ if (NULL == pc->dsh)
+ goto cleanup;
+ }
if (fi_pos != NULL)
{
pc->fi_pos = find_file_position (pc->fi,
pc->fi_pos = pc->fi;
}
}
+ GNUNET_free (fi_root);
+ fi_root = NULL;
/* generate RESUME event(s) */
GNUNET_FS_file_information_inspect (pc->fi,
&fip_signal_resume,
GNUNET_FS_file_information_destroy (pc->fi, NULL, NULL);
if (0 != UNLINK (filename))
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", filename);
- GNUNET_free_non_null (pc->serialization);
+ GNUNET_free (pc->serialization);
GNUNET_free (pc);
return GNUNET_OK;
}
}
wh = get_write_handle (pc->h, GNUNET_FS_SYNC_PATH_MASTER_PUBLISH, pc->serialization);
if (wh == NULL)
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
if ( (GNUNET_OK !=
GNUNET_BIO_write_string (wh, pc->nid)) ||
(GNUNET_OK !=
(GNUNET_OK !=
GNUNET_BIO_write_string (wh, (pc->namespace == NULL) ? NULL : pc->namespace->name)) )
{
+ GNUNET_break (0);
goto cleanup;
}
if (GNUNET_OK !=
GNUNET_BIO_write_close (wh))
{
wh = NULL;
+ GNUNET_break (0);
goto cleanup;
}
return;
{
struct GNUNET_BIO_WriteHandle *wh;
- if (UNINDEX_STATE_ABORTED == uc->state)
- return;
if (NULL == uc->serialization)
uc->serialization = make_serialization_file_name (uc->h,
GNUNET_FS_SYNC_PATH_MASTER_UNINDEX);
return;
wh = get_write_handle (uc->h, GNUNET_FS_SYNC_PATH_MASTER_UNINDEX, uc->serialization);
if (wh == NULL)
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
if ( (GNUNET_OK !=
GNUNET_BIO_write_string (wh, uc->filename)) ||
(GNUNET_OK !=
( (uc->state == UNINDEX_STATE_ERROR) &&
(GNUNET_OK !=
GNUNET_BIO_write_string (wh, uc->emsg)) ) )
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
if (GNUNET_OK !=
GNUNET_BIO_write_close (wh))
{
wh = NULL;
+ GNUNET_break (0);
goto cleanup;
}
return;
*
* @param dc download context to compute for
* @param uni unique filename to use, use "" for the directory name
+ * @param ext extension to use, use ".dir" for our own subdirectory
* @return the expanded file name, NULL for none
*/
static char *
get_download_sync_filename (struct GNUNET_FS_DownloadContext *dc,
- const char *uni)
+ const char *uni,
+ const char *ext)
{
char *par;
char *epar;
uni);
if (dc->parent->serialization == NULL)
return NULL;
- par = get_download_sync_filename (dc->parent, dc->parent->serialization);
+ par = get_download_sync_filename (dc->parent, dc->parent->serialization, "");
if (par == NULL)
return NULL;
GNUNET_asprintf (&epar,
- "%s.dir%s%s",
+ "%s.dir%s%s%s",
par,
DIR_SEPARATOR_STR,
- uni);
+ uni,
+ ext);
GNUNET_free (par);
return epar;
}
if (NULL == dc->serialization)
{
- dir = get_download_sync_filename (dc, "");
+ dir = get_download_sync_filename (dc, "", "");
if (dir == NULL)
return;
if (GNUNET_OK !=
}
fn = GNUNET_DISK_mktemp (dir);
GNUNET_free (dir);
+ if (fn == NULL)
+ return;
dc->serialization = get_serialization_short_name (fn);
}
else
{
- fn = get_download_sync_filename (dc, dc->serialization);
+ fn = get_download_sync_filename (dc, dc->serialization, "");
+ if (fn == NULL)
+ {
+ GNUNET_free (dc->serialization);
+ dc->serialization = NULL;
+ GNUNET_free (fn);
+ return;
+ }
}
wh = GNUNET_BIO_write_open (fn);
if (wh == NULL)
(GNUNET_YES == GNUNET_FS_uri_test_loc (dc->uri)) );
uris = GNUNET_FS_uri_to_string (dc->uri);
num_pending = 0;
- if (dc->emsg != NULL)
+ if (dc->emsg == NULL)
(void) GNUNET_CONTAINER_multihashmap_iterate (dc->active,
&count_download_requests,
&num_pending);
GNUNET_BIO_write_int32 (wh, (uint32_t) dc->has_finished)) ||
(GNUNET_OK !=
GNUNET_BIO_write_int32 (wh, num_pending)) )
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
if (GNUNET_SYSERR ==
GNUNET_CONTAINER_multihashmap_iterate (dc->active,
&write_download_request,
wh))
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
GNUNET_free_non_null (uris);
+ uris = NULL;
if (GNUNET_OK !=
GNUNET_BIO_write_close (wh))
{
wh = NULL;
+ GNUNET_break (0);
goto cleanup;
}
GNUNET_free (fn);
sr->sc->serialization,
sr->serialization);
if (wh == NULL)
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
uris = GNUNET_FS_uri_to_string (sr->uri);
if ( (GNUNET_OK !=
GNUNET_BIO_write_string (wh, uris)) ||
GNUNET_BIO_write_int32 (wh, sr->availability_success)) ||
(GNUNET_OK !=
GNUNET_BIO_write_int32 (wh, sr->availability_trials)) )
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
if (GNUNET_OK !=
GNUNET_BIO_write_close (wh))
{
wh = NULL;
+ GNUNET_break (0);
goto cleanup;
}
GNUNET_free_non_null (uris);
category);
if (NULL == sc->serialization)
return;
+ uris = NULL;
wh = get_write_handle (sc->h, category, sc->serialization);
if (wh == NULL)
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
GNUNET_assert ( (GNUNET_YES == GNUNET_FS_uri_test_ksk (sc->uri)) ||
(GNUNET_YES == GNUNET_FS_uri_test_sks (sc->uri)) );
uris = GNUNET_FS_uri_to_string (sc->uri);
GNUNET_BIO_write (wh, &in_pause, sizeof (in_pause))) ||
(GNUNET_OK !=
GNUNET_BIO_write_int32 (wh, sc->anonymity)) )
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
GNUNET_free (uris);
uris = NULL;
if (GNUNET_OK !=
GNUNET_BIO_write_close (wh))
{
wh = NULL;
+ GNUNET_break (0);
goto cleanup;
}
return;
uc->serialization = get_serialization_short_name (filename);
rh = GNUNET_BIO_read_open (filename);
if (rh == NULL)
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
if ( (GNUNET_OK !=
GNUNET_BIO_read_string (rh, "unindex-fn", &uc->filename, 10*1024)) ||
(GNUNET_OK !=
read_start_time (rh, &uc->start_time)) ||
(GNUNET_OK !=
GNUNET_BIO_read_int32 (rh, &state)) )
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
uc->state = (enum UnindexState) state;
switch (state)
{
case UNINDEX_STATE_FS_NOTIFY:
if (GNUNET_OK !=
GNUNET_BIO_read (rh, "unindex-hash", &uc->file_id, sizeof (GNUNET_HashCode)))
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
break;
case UNINDEX_STATE_DS_REMOVE:
break;
case UNINDEX_STATE_ERROR:
if (GNUNET_OK !=
GNUNET_BIO_read_string (rh, "unindex-emsg", &uc->emsg, 10*1024))
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
break;
- case UNINDEX_STATE_ABORTED:
- GNUNET_break (0);
- goto cleanup;
default:
GNUNET_break (0);
goto cleanup;
switch (uc->state)
{
case UNINDEX_STATE_HASHING:
- GNUNET_CRYPTO_hash_file (uc->h->sched,
- GNUNET_SCHEDULER_PRIORITY_IDLE,
- uc->filename,
- HASHING_BLOCKSIZE,
- &GNUNET_FS_unindex_process_hash_,
- uc);
+ uc->fhc = GNUNET_CRYPTO_hash_file (uc->h->sched,
+ GNUNET_SCHEDULER_PRIORITY_IDLE,
+ uc->filename,
+ HASHING_BLOCKSIZE,
+ &GNUNET_FS_unindex_process_hash_,
+ uc);
break;
case UNINDEX_STATE_FS_NOTIFY:
uc->state = UNINDEX_STATE_HASHING;
GNUNET_BIO_read_int32 (rh, &sr->availability_success)) ||
(GNUNET_OK !=
GNUNET_BIO_read_int32 (rh, &sr->availability_trials)) )
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
GNUNET_free (uris);
if (download != NULL)
{
drh = get_read_handle (sc->h,
GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD,
download);
- deserialize_download (sc->h,
- drh,
- NULL,
- sr,
- download);
- if (GNUNET_OK !=
- GNUNET_BIO_read_close (drh, &emsg))
+ if (drh != NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to resume sub-download `%s': %s\n"),
- download,
- emsg);
- GNUNET_free (emsg);
+ deserialize_download (sc->h,
+ drh,
+ NULL,
+ sr,
+ download);
+ if (GNUNET_OK !=
+ GNUNET_BIO_read_close (drh, &emsg))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to resume sub-download `%s': %s\n"),
+ download,
+ emsg);
+ GNUNET_free (emsg);
+ }
}
GNUNET_free (download);
}
drh = get_read_handle (sc->h,
GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
update_srch);
- deserialize_search (sc->h,
- drh,
- sr,
- update_srch);
- if (GNUNET_OK !=
- GNUNET_BIO_read_close (drh, &emsg))
+ if (drh != NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to resume sub-search `%s': %s\n"),
- update_srch,
- emsg);
- GNUNET_free (emsg);
+ deserialize_search (sc->h,
+ drh,
+ sr,
+ update_srch);
+ if (GNUNET_OK !=
+ GNUNET_BIO_read_close (drh, &emsg))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to resume sub-search `%s': %s\n"),
+ update_srch,
+ emsg);
+ GNUNET_free (emsg);
+ }
}
GNUNET_free (update_srch);
}
&sr->key,
sr,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ if (GNUNET_OK !=
+ GNUNET_BIO_read_close (rh, &emsg))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failure while resuming search operation `%s': %s\n"),
+ filename,
+ emsg);
+ GNUNET_free (emsg);
+ }
return GNUNET_OK;
cleanup:
GNUNET_free_non_null (download);
GNUNET_CONTAINER_meta_data_destroy (sr->meta);
GNUNET_free (sr->serialization);
GNUNET_free (sr);
+ if (GNUNET_OK !=
+ GNUNET_BIO_read_close (rh, &emsg))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failure while resuming search operation `%s': %s\n"),
+ filename,
+ emsg);
+ GNUNET_free (emsg);
+ }
return GNUNET_OK;
}
ser = get_serialization_short_name (filename);
rh = GNUNET_BIO_read_open (filename);
+ if (rh == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to resume sub-download `%s': could not open file `%s'\n"),
+ ser,
+ filename);
+ GNUNET_free (ser);
+ return GNUNET_OK;
+ }
deserialize_download (parent->h,
rh,
parent,
GNUNET_BIO_read_int32 (rh, &status)) ||
(GNUNET_OK !=
GNUNET_BIO_read_int32 (rh, &num_pending)) )
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
dc->options = (enum GNUNET_FS_DownloadOptions) options;
dc->active = GNUNET_CONTAINER_multihashmap_create (16);
dc->has_finished = (int) status;
&dc->target));
if ( (dc->length > dc->completed) &&
(num_pending == 0) )
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
while (0 < num_pending--)
{
dr = GNUNET_malloc (sizeof (struct DownloadRequest));
GNUNET_BIO_read_int64 (rh, &dr->offset)) ||
(GNUNET_OK !=
GNUNET_BIO_read_int32 (rh, &dr->depth)) )
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
dr->is_pending = GNUNET_YES;
dr->next = dc->pending;
dc->pending = dr;
+ GNUNET_CONTAINER_multihashmap_put (dc->active,
+ &dr->chk.query,
+ dr,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+
dr = NULL;
}
- dn = get_download_sync_filename (dc, "");
+ dn = get_download_sync_filename (dc, dc->serialization, ".dir");
if (dn != NULL)
{
if (GNUNET_YES ==
GNUNET_free (dn);
}
if (parent != NULL)
- GNUNET_CONTAINER_DLL_insert (parent->child_head,
- parent->child_tail,
- dc);
+ {
+ abort (); // for debugging for now
+ GNUNET_CONTAINER_DLL_insert (parent->child_head,
+ parent->child_tail,
+ dc);
+ }
if (search != NULL)
{
dc->search = search;
search->download = dc;
}
- if ( (parent == NULL) ||
+ if ( (parent == NULL) &&
(search == NULL) )
- dc->top = GNUNET_FS_make_top (dc->h,
- &GNUNET_FS_download_signal_suspend_,
- dc);
- signal_download_resume (dc);
+ {
+ dc->top = GNUNET_FS_make_top (dc->h,
+ &GNUNET_FS_download_signal_suspend_,
+ dc);
+ signal_download_resume (dc);
+ }
GNUNET_free (uris);
return;
cleanup:
GNUNET_BIO_read (rh, "search-pause", &in_pause, sizeof (in_pause))) ||
(GNUNET_OK !=
GNUNET_BIO_read_int32 (rh, &sc->anonymity)) )
- goto cleanup;
+ {
+ GNUNET_break (0);
+ goto cleanup;
+ }
sc->options = (enum GNUNET_FS_SearchOptions) options;
sc->master_result_map = GNUNET_CONTAINER_multihashmap_create (16);
dn = get_serialization_file_name_in_dir (h,
return GNUNET_OK;
}
sc = deserialize_search (h, rh, NULL, ser);
- sc->top = GNUNET_FS_make_top (h, &GNUNET_FS_search_signal_suspend_, sc);
+ if (sc != NULL)
+ sc->top = GNUNET_FS_make_top (h, &GNUNET_FS_search_signal_suspend_, sc);
GNUNET_free (ser);
if (GNUNET_OK !=
GNUNET_BIO_read_close (rh, &emsg))
rh = GNUNET_BIO_read_open (filename);
if (rh == NULL)
{
- if (filename != NULL)
- {
- if (0 != UNLINK (filename))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
- "unlink",
- filename);
- GNUNET_free (ser);
- }
+ if (0 != UNLINK (filename))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+ "unlink",
+ filename);
+ GNUNET_free (ser);
return GNUNET_OK;
}
deserialize_download (h, rh, NULL, NULL, ser);
projects / oweals / gnunet.git / blobdiff