/* stop probes if possible */
num_probes_change = - num_probes_active;
num_downloads_change = h->max_parallel_requests - h->active_downloads;
- }
- else
+ }
+ else
{
/* start all downloads */
num_downloads_change = num_downloads_waiting;
num_probes_change = GNUNET_MIN (num_probes_waiting,
h->max_parallel_requests - (h->active_downloads + num_downloads_waiting));
}
-
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Changing %d probes and %d downloads\n",
num_probes_change,
next = qe->next;
if (GNUNET_FS_QUEUE_PRIORITY_PROBE != qe->priority)
continue;
- if (num_probes_change < 0)
+ if (num_probes_change < 0)
{
stop_job (qe);
num_probes_change++;
( (qe->blocks + h->active_blocks <= h->max_parallel_requests) ||
( (qe->blocks > h->max_parallel_requests) &&
(0 == h->active_downloads) ) ) )
- {
+ {
start_job (qe);
num_downloads_change--;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"AD: %u, MP: %u; %d probes and %d downloads to start, will run again in %s\n",
h->active_downloads,
- h->max_parallel_requests,
+ h->max_parallel_requests,
num_probes_change,
num_downloads_change,
GNUNET_STRINGS_relative_time_to_string (restart_at, GNUNET_YES));
{
struct GNUNET_FS_QueueEntry *qe;
- qe = GNUNET_malloc (sizeof (struct GNUNET_FS_QueueEntry));
+ qe = GNUNET_new (struct GNUNET_FS_QueueEntry);
qe->h = h;
qe->start = start;
qe->stop = stop;
{
struct TopLevelActivity *ret;
- ret = GNUNET_malloc (sizeof (struct TopLevelActivity));
+ ret = GNUNET_new (struct TopLevelActivity);
ret->ssf = ssf;
ret->ssf_cls = ssf_cls;
GNUNET_CONTAINER_DLL_insert (h->top_head, h->top_tail, ret);
return 0;
}
}
- if ( (GNUNET_SYSERR ==
+ if ( (GNUNET_SYSERR ==
GNUNET_DISK_file_seek (fi->fd, offset, GNUNET_DISK_SEEK_SET)) ||
(-1 == (ret = GNUNET_DISK_file_read (fi->fd, buf, max))) )
{
* @param ent entity identifier
*/
void
-GNUNET_FS_remove_sync_file_ (struct GNUNET_FS_Handle *h, const char *ext,
+GNUNET_FS_remove_sync_file_ (struct GNUNET_FS_Handle *h,
+ const char *ext,
const char *ent)
{
char *filename;
filename = get_serialization_file_name (h, ext, ent);
if (NULL != filename)
{
- if (0 != UNLINK (filename))
+ if ( (0 != UNLINK (filename)) &&
+ (ENOENT != errno) )
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", filename);
GNUNET_free (filename);
}
*
* @param rh handle for reading
* @param timestamp where to write the deserialized timestamp
- * @return GNUNET_OK on success
+ * @return #GNUNET_OK on success
*/
static int
read_start_time (struct GNUNET_BIO_ReadHandle *rh,
GNUNET_break (0);
return NULL;
}
- ret = GNUNET_malloc (sizeof (struct GNUNET_FS_FileInformation));
+ ret = GNUNET_new (struct GNUNET_FS_FileInformation);
ret->h = h;
ksks = NULL;
chks = NULL;
case 4: /* directory */
ret->is_directory = GNUNET_YES;
if ((GNUNET_OK != GNUNET_BIO_read_int32 (rh, &dsize)) ||
+ (GNUNET_OK != GNUNET_BIO_read_int64 (rh, &ret->data.dir.contents_completed)) ||
+ (GNUNET_OK != GNUNET_BIO_read_int64 (rh, &ret->data.dir.contents_size)) ||
(NULL == (ret->data.dir.dir_data = GNUNET_malloc_large (dsize))) ||
(GNUNET_OK !=
GNUNET_BIO_read (rh, "dir-data", ret->data.dir.dir_data, dsize)) ||
* @return NULL on error
*/
static struct GNUNET_FS_FileInformation *
-deserialize_file_information (struct GNUNET_FS_Handle *h, const char *filename)
+deserialize_file_information (struct GNUNET_FS_Handle *h,
+ const char *filename)
{
struct GNUNET_FS_FileInformation *ret;
struct GNUNET_BIO_ReadHandle *rh;
(NULL == fi->data.dir.entries->serialization) )
GNUNET_FS_file_information_sync_ (fi->data.dir.entries);
if ((GNUNET_OK != GNUNET_BIO_write_int32 (wh, fi->data.dir.dir_size)) ||
+ (GNUNET_OK != GNUNET_BIO_write_int64 (wh, fi->data.dir.contents_completed)) ||
+ (GNUNET_OK != GNUNET_BIO_write_int64 (wh, fi->data.dir.contents_size)) ||
(GNUNET_OK !=
GNUNET_BIO_write (wh, fi->data.dir.dir_data,
(uint32_t) fi->data.dir.dir_size)) ||
* @return NULL if srch was not found in this subtree
*/
static struct GNUNET_FS_FileInformation *
-find_file_position (struct GNUNET_FS_FileInformation *pos,
+find_file_position (struct GNUNET_FS_FileInformation *pos,
const char *srch)
{
struct GNUNET_FS_FileInformation *r;
return pos;
if ( (GNUNET_YES == pos->is_directory) &&
(NULL != (r = find_file_position (pos->data.dir.entries, srch))) )
- return r;
+ return r;
pos = pos->next;
}
return NULL;
int32_t all_done;
int32_t have_ns;
char *fi_root;
- struct GNUNET_CRYPTO_EccPrivateKey ns;
+ struct GNUNET_CRYPTO_EcdsaPrivateKey ns;
char *fi_pos;
char *emsg;
}
if (GNUNET_YES == have_ns)
{
- pc->ns = GNUNET_new (struct GNUNET_CRYPTO_EccPrivateKey);
+ pc->ns = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPrivateKey);
*pc->ns = ns;
}
if ((0 == (pc->options & GNUNET_FS_PUBLISH_OPTION_SIMULATE_ONLY)) &&
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pc->upload_task);
pc->upload_task =
GNUNET_SCHEDULER_add_with_priority
- (GNUNET_SCHEDULER_PRIORITY_BACKGROUND,
+ (GNUNET_SCHEDULER_PRIORITY_BACKGROUND,
&GNUNET_FS_publish_main_, pc);
}
if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg))
( (NULL != pc->ns) &&
(GNUNET_OK != GNUNET_BIO_write (wh,
pc->ns,
- sizeof (struct GNUNET_CRYPTO_EccPrivateKey)) ) ))
+ sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)) ) ))
{
GNUNET_break (0);
goto cleanup;
/**
* Serialize a download request.
*
- * @param wh the 'struct GNUNET_BIO_WriteHandle*'
- * @param dr the 'struct DownloadRequest'
- * @return GNUNET_YES on success, GNUNET_NO on error
+ * @param wh the `struct GNUNET_BIO_WriteHandle*`
+ * @param dr the the request to write to disk
+ * @return #GNUNET_YES on success, #GNUNET_NO on error
*/
static int
write_download_request (struct GNUNET_BIO_WriteHandle *wh,
* Read a download request tree.
*
* @param rh mesh to read from
- * @return value the 'struct DownloadRequest', NULL on error
+ * @return value the download request read from disk, NULL on error
*/
static struct DownloadRequest *
read_download_request (struct GNUNET_BIO_ReadHandle *rh)
struct DownloadRequest *dr;
unsigned int i;
- dr = GNUNET_malloc (sizeof (struct DownloadRequest));
+ dr = GNUNET_new (struct DownloadRequest);
if ((GNUNET_OK != GNUNET_BIO_read_int32 (rh, &dr->state)) ||
(GNUNET_OK != GNUNET_BIO_read_int64 (rh, &dr->offset)) ||
(GNUNET_OK != GNUNET_BIO_read_int32 (rh, &dr->num_children)) ||
if (NULL != wh)
(void) GNUNET_BIO_write_close (wh);
remove_sync_file_in_dir (sr->h,
- (NULL == sr->sc->psearch_result)
- ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH
+ (NULL == sr->sc->psearch_result)
+ ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH
: GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
sr->sc->serialization, sr->serialization);
GNUNET_free (sr->serialization);
const char *category;
category =
- (NULL == sc->psearch_result)
- ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH
+ (NULL == sc->psearch_result)
+ ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH
: GNUNET_FS_SYNC_PATH_CHILD_SEARCH;
if (NULL == sc->serialization)
sc->serialization = make_serialization_file_name (sc->h, category);
char *uris;
uint32_t state;
- uc = GNUNET_malloc (sizeof (struct GNUNET_FS_UnindexContext));
+ uc = GNUNET_new (struct GNUNET_FS_UnindexContext);
uc->h = h;
uc->serialization = get_serialization_short_name (filename);
rh = GNUNET_BIO_read_open (filename);
{
GNUNET_break (0);
goto cleanup;
- }
+ }
uc->state = (enum UnindexState) state;
switch (state)
{
*
* @param cls the 'struct GNUNET_FS_SearchContext*'
* @param filename complete filename (absolute path)
- * @return GNUNET_OK (continue to iterate)
+ * @return #GNUNET_OK (continue to iterate)
*/
static int
deserialize_search_result (void *cls, const char *filename)
if (NULL != ser)
{
remove_sync_file_in_dir (sc->h,
- (NULL == sc->psearch_result)
- ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH
+ (NULL == sc->psearch_result)
+ ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH
: GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
sc->serialization, ser);
GNUNET_free (ser);
uris = NULL;
download = NULL;
update_srch = NULL;
- sr = GNUNET_malloc (sizeof (struct GNUNET_FS_SearchResult));
+ sr = GNUNET_new (struct GNUNET_FS_SearchResult);
sr->h = sc->h;
sr->sc = sc;
sr->serialization = ser;
GNUNET_free (update_srch);
}
GNUNET_break (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_put (sc->master_result_map, &sr->key, sr,
+ GNUNET_CONTAINER_multihashmap_put (sc->master_result_map,
+ &sr->key, sr,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg))
{
*
* @param cls the 'struct GNUNET_FS_DownloadContext*' (parent)
* @param filename complete filename (absolute path)
- * @return GNUNET_OK (continue to iterate)
+ * @return #GNUNET_OK (continue to iterate)
*/
static int
deserialize_subdownload (void *cls, const char *filename)
uris = NULL;
emsg = NULL;
- dc = GNUNET_malloc (sizeof (struct GNUNET_FS_DownloadContext));
+ dc = GNUNET_new (struct GNUNET_FS_DownloadContext);
dc->parent = parent;
dc->h = h;
dc->serialization = GNUNET_strdup (serialization);
}
uris = NULL;
emsg = NULL;
- sc = GNUNET_malloc (sizeof (struct GNUNET_FS_SearchContext));
+ sc = GNUNET_new (struct GNUNET_FS_SearchContext);
if (NULL != psearch_result)
{
sc->psearch_result = psearch_result;
*
* @param cls the 'struct GNUNET_FS_Handle*'
* @param filename complete filename (absolute path)
- * @return GNUNET_OK (continue to iterate)
+ * @return #GNUNET_OK (continue to iterate)
*/
static int
deserialize_search_file (void *cls, const char *filename)
*
* @param cls the 'struct GNUNET_FS_Handle*'
* @param filename complete filename (absolute path)
- * @return GNUNET_OK (continue to iterate)
+ * @return #GNUNET_OK (continue to iterate)
*/
static int
deserialize_download_file (void *cls, const char *filename)
enum GNUNET_FS_OPTIONS opt;
va_list ap;
- ret = GNUNET_malloc (sizeof (struct GNUNET_FS_Handle));
+ ret = GNUNET_new (struct GNUNET_FS_Handle);
ret->cfg = cfg;
ret->client_name = GNUNET_strdup (client_name);
ret->upcb = upcb;