/*
This file is part of GNUnet.
- (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2001--2012 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
#include "fs_api.h"
#include "fs_tree.h"
+/**
+ * How many block requests can we have outstanding in parallel at a time by default?
+ */
+#define DEFAULT_MAX_PARALLEL_REQUESTS (1024 * 10)
+
+/**
+ * How many downloads can we have outstanding in parallel at a time by default?
+ */
+#define DEFAULT_MAX_PARALLEL_DOWNLOADS 16
/**
* Start the given job (send signal, remove from pending queue, update
{
GNUNET_assert (NULL == qe->client);
qe->client = GNUNET_CLIENT_connect ("fs", qe->h->cfg);
- if (qe->client == NULL)
+ if (NULL == qe->client)
{
GNUNET_break (0);
return;
qe->start (qe->cls, qe->client);
qe->start_times++;
qe->h->active_blocks += qe->blocks;
+ qe->h->active_downloads++;
qe->start_time = GNUNET_TIME_absolute_get ();
- GNUNET_CONTAINER_DLL_remove (qe->h->pending_head, qe->h->pending_tail, qe);
- GNUNET_CONTAINER_DLL_insert_after (qe->h->running_head, qe->h->running_tail,
- qe->h->running_tail, qe);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting job %p (%u active)\n",
+ qe,
+ qe->h->active_downloads);
+ GNUNET_CONTAINER_DLL_remove (qe->h->pending_head,
+ qe->h->pending_tail,
+ qe);
+ GNUNET_CONTAINER_DLL_insert_after (qe->h->running_head,
+ qe->h->running_tail,
+ qe->h->running_tail,
+ qe);
}
{
qe->client = NULL;
qe->stop (qe->cls);
+ GNUNET_assert (0 < qe->h->active_downloads);
qe->h->active_downloads--;
qe->h->active_blocks -= qe->blocks;
qe->run_time =
GNUNET_TIME_relative_add (qe->run_time,
GNUNET_TIME_absolute_get_duration
(qe->start_time));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Stopping job %p (%u active)\n",
+ qe,
+ qe->h->active_downloads);
GNUNET_CONTAINER_DLL_remove (qe->h->running_head, qe->h->running_tail, qe);
GNUNET_CONTAINER_DLL_insert_after (qe->h->pending_head, qe->h->pending_tail,
qe->h->pending_tail, qe);
* Process the jobs in the job queue, possibly starting some
* and stopping others.
*
- * @param cls the 'struct GNUNET_FS_Handle'
+ * @param cls the `struct GNUNET_FS_Handle *`
* @param tc scheduler context
*/
static void
-process_job_queue (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+process_job_queue (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_FS_Handle *h = cls;
struct GNUNET_FS_QueueEntry *qe;
struct GNUNET_TIME_Relative restart_at;
struct GNUNET_TIME_Relative rst;
struct GNUNET_TIME_Absolute end_time;
-
- h->queue_job = GNUNET_SCHEDULER_NO_TASK;
- next = h->pending_head;
- while (NULL != (qe = next))
+ unsigned int num_downloads_waiting;
+ unsigned int num_downloads_active;
+ unsigned int num_downloads_expired;
+ unsigned int num_probes_active;
+ unsigned int num_probes_waiting;
+ unsigned int num_probes_expired;
+ int num_probes_change;
+ int num_downloads_change;
+ int block_limit_hit;
+
+ h->queue_job = NULL;
+ /* restart_at will be set to the time when it makes sense to
+ re-evaluate the job queue (unless, of course, jobs complete
+ or are added, then we'll be triggered immediately */
+ restart_at = GNUNET_TIME_UNIT_FOREVER_REL;
+ /* first, calculate some basic statistics on pending jobs */
+ num_probes_waiting = 0;
+ num_downloads_waiting = 0;
+ for (qe = h->pending_head; NULL != qe; qe = qe->next)
{
- next = qe->next;
- if (h->running_head == NULL)
- {
- start_job (qe);
- continue;
- }
- if ((qe->blocks + h->active_blocks <= h->max_parallel_requests) &&
- (h->active_downloads + 1 <= h->max_parallel_downloads))
+ switch (qe->priority)
{
- start_job (qe);
- continue;
+ case GNUNET_FS_QUEUE_PRIORITY_PROBE:
+ num_probes_waiting++;
+ break;
+ case GNUNET_FS_QUEUE_PRIORITY_NORMAL:
+ num_downloads_waiting++;
+ break;
+ default:
+ GNUNET_break (0);
+ break;
}
}
- if (h->pending_head == NULL)
- return; /* no need to stop anything */
- restart_at = GNUNET_TIME_UNIT_FOREVER_REL;
+ /* now, calculate some basic statistics on running jobs */
+ num_probes_active = 0;
+ num_probes_expired = 0;
+ num_downloads_active = 0;
+ num_downloads_expired = 0;
next = h->running_head;
while (NULL != (qe = next))
{
next = qe->next;
- run_time =
+ switch (qe->priority)
+ {
+ case GNUNET_FS_QUEUE_PRIORITY_PROBE:
+ run_time = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2);
+ end_time = GNUNET_TIME_absolute_add (qe->start_time, run_time);
+ rst = GNUNET_TIME_absolute_get_remaining (end_time);
+ if (0 == rst.rel_value_us)
+ {
+ num_probes_expired++;
+ stop_job (qe);
+ }
+ else
+ {
+ num_probes_active++;
+ restart_at = GNUNET_TIME_relative_min (rst, restart_at);
+ }
+ break;
+ case GNUNET_FS_QUEUE_PRIORITY_NORMAL:
+ run_time =
GNUNET_TIME_relative_multiply (h->avg_block_latency,
qe->blocks * qe->start_times);
- end_time = GNUNET_TIME_absolute_add (qe->start_time, run_time);
- rst = GNUNET_TIME_absolute_get_remaining (end_time);
- restart_at = GNUNET_TIME_relative_min (rst, restart_at);
- if (rst.rel_value > 0)
+ end_time = GNUNET_TIME_absolute_add (qe->start_time, run_time);
+ rst = GNUNET_TIME_absolute_get_remaining (end_time);
+ if (0 == rst.rel_value_us)
+ {
+ num_downloads_expired++;
+ stop_job (qe);
+ }
+ else
+ {
+ num_downloads_active++;
+ restart_at = GNUNET_TIME_relative_min (rst, restart_at);
+ }
+ break;
+ default:
+ GNUNET_break (0);
+ break;
+ }
+ }
+ GNUNET_break (h->active_downloads ==
+ num_downloads_active + num_probes_active);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "PA: %u, PE: %u, PW: %u; DA: %u, DE: %u, DW: %u\n",
+ num_probes_active,
+ num_probes_expired,
+ num_probes_waiting,
+ num_downloads_active,
+ num_downloads_expired,
+ num_downloads_waiting);
+ GNUNET_break (h->active_downloads + num_probes_active <=
+ h->max_parallel_downloads);
+ /* calculate start/stop decisions */
+ if (h->active_downloads + num_downloads_waiting > h->max_parallel_downloads)
+ {
+ /* stop as many probes as there are downloads and probes */
+ num_probes_change = - GNUNET_MIN (num_probes_active,
+ num_downloads_waiting);
+ /* start as many downloads as there are free slots, including those
+ we just opened up */
+ num_downloads_change = h->max_parallel_downloads - h->active_downloads - num_probes_change;
+ }
+ else
+ {
+ /* start all downloads (we can) */
+ num_downloads_change = num_downloads_waiting;
+ /* also start probes if there is room, but use a lower cap of (mpd/4) + 1 */
+ if (1 + h->max_parallel_downloads / 4 >= (h->active_downloads + num_downloads_change))
+ num_probes_change = GNUNET_MIN (num_probes_waiting,
+ (1 + h->max_parallel_downloads / 4) - (h->active_downloads + num_downloads_change));
+ else
+ num_probes_change = 0;
+ }
+ GNUNET_break (num_downloads_change <= num_downloads_waiting);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Changing %d probes and %d/%u/%u downloads\n",
+ num_probes_change,
+ num_downloads_change,
+ (unsigned int) h->active_downloads,
+ (unsigned int) h->max_parallel_downloads);
+ /* actually stop probes */
+ next = h->running_head;
+ while (NULL != (qe = next))
+ {
+ next = qe->next;
+ if (GNUNET_FS_QUEUE_PRIORITY_PROBE != qe->priority)
continue;
- stop_job (qe);
+ if (num_probes_change < 0)
+ {
+ stop_job (qe);
+ num_probes_change++;
+ if (0 == num_probes_change)
+ break;
+ }
}
+ GNUNET_break (0 <= num_probes_change);
+
+ /* start some more tasks if we now have empty slots */
+ block_limit_hit = GNUNET_NO;
+ next = h->pending_head;
+ while ( (NULL != (qe = next)) &&
+ ( (num_probes_change > 0) ||
+ (num_downloads_change > 0) ) )
+ {
+ next = qe->next;
+ switch (qe->priority)
+ {
+ case GNUNET_FS_QUEUE_PRIORITY_PROBE:
+ if (num_probes_change > 0)
+ {
+ start_job (qe);
+ num_probes_change--;
+ run_time = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2);
+ restart_at = GNUNET_TIME_relative_min (run_time, restart_at);
+ }
+ break;
+ case GNUNET_FS_QUEUE_PRIORITY_NORMAL:
+ if ( (num_downloads_change > 0) &&
+ ( (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--;
+ }
+ else if (num_downloads_change > 0)
+ block_limit_hit = GNUNET_YES;
+ break;
+ default:
+ GNUNET_break (0);
+ break;
+ }
+ }
+ GNUNET_break ( (0 == num_downloads_change) ||
+ (GNUNET_YES == block_limit_hit) );
+ GNUNET_break (0 == num_probes_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,
+ num_probes_change,
+ num_downloads_change,
+ GNUNET_STRINGS_relative_time_to_string (restart_at, GNUNET_YES));
+
+ /* make sure we run again */
h->queue_job =
GNUNET_SCHEDULER_add_delayed (restart_at, &process_job_queue, h);
}
* @return queue handle
*/
struct GNUNET_FS_QueueEntry *
-GNUNET_FS_queue_ (struct GNUNET_FS_Handle *h, GNUNET_FS_QueueStart start,
- GNUNET_FS_QueueStop stop, void *cls, unsigned int blocks,
+GNUNET_FS_queue_ (struct GNUNET_FS_Handle *h,
+ GNUNET_FS_QueueStart start,
+ GNUNET_FS_QueueStop stop, void *cls,
+ unsigned int blocks,
enum GNUNET_FS_QueuePriority priority)
{
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;
qe->priority = priority;
GNUNET_CONTAINER_DLL_insert_after (h->pending_head, h->pending_tail,
h->pending_tail, qe);
- if (h->queue_job != GNUNET_SCHEDULER_NO_TASK)
+ if (h->queue_job != NULL)
GNUNET_SCHEDULER_cancel (h->queue_job);
h->queue_job = GNUNET_SCHEDULER_add_now (&process_job_queue, h);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Queueing job %p\n",
+ qe);
return qe;
}
/**
* Dequeue a job from the queue.
- * @param qh handle for the job
+ *
+ * @param qe handle for the job
*/
void
-GNUNET_FS_dequeue_ (struct GNUNET_FS_QueueEntry *qh)
+GNUNET_FS_dequeue_ (struct GNUNET_FS_QueueEntry *qe)
{
struct GNUNET_FS_Handle *h;
- h = qh->h;
- if (qh->client != NULL)
- stop_job (qh);
- GNUNET_CONTAINER_DLL_remove (h->pending_head, h->pending_tail, qh);
- GNUNET_free (qh);
- if (h->queue_job != GNUNET_SCHEDULER_NO_TASK)
+ h = qe->h;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Dequeueing job %p\n",
+ qe);
+ if (NULL != qe->client)
+ stop_job (qe);
+ GNUNET_CONTAINER_DLL_remove (h->pending_head, h->pending_tail, qe);
+ GNUNET_free (qe);
+ if (h->queue_job != NULL)
GNUNET_SCHEDULER_cancel (h->queue_job);
h->queue_job = GNUNET_SCHEDULER_add_now (&process_job_queue, h);
}
*
* @param h global fs handle
* @param ssf suspend signal function to use
- * @param ssf_cls closure for ssf
+ * @param ssf_cls closure for @a ssf
* @return fresh top-level activity handle
*/
struct TopLevelActivity *
-GNUNET_FS_make_top (struct GNUNET_FS_Handle *h, SuspendSignalFunction ssf,
+GNUNET_FS_make_top (struct GNUNET_FS_Handle *h,
+ SuspendSignalFunction ssf,
void *ssf_cls)
{
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);
* @param top top level activity entry
*/
void
-GNUNET_FS_end_top (struct GNUNET_FS_Handle *h, struct TopLevelActivity *top)
+GNUNET_FS_end_top (struct GNUNET_FS_Handle *h,
+ struct TopLevelActivity *top)
{
GNUNET_CONTAINER_DLL_remove (h->top_head, h->top_tail, top);
GNUNET_free (top);
}
-
/**
- * Closure for "data_reader_file".
+ * Closure for #GNUNET_FS_data_reader_file_().
*/
struct FileInfo
{
/**
* Function that provides data by reading from a file.
*
- * @param cls closure (points to the file information)
+ * @param cls closure with the `struct FileInfo *`
* @param offset offset to read from; it is possible
* that the caller might need to go backwards
- * a bit at times
+ * a bit at times; set to `UINT64_MAX` to tell
+ * the reader that we won't be reading for a while
+ * (used to close the file descriptor but NOT fully
+ * clean up the reader's state); in this case,
+ * a value of '0' for @a max should be ignored
* @param max maximum number of bytes that should be
- * copied to buf; readers are not allowed
+ * copied to @a buf; readers are not allowed
* to provide less data unless there is an error;
* a value of "0" will be used at the end to allow
* the reader to clean up its internal state
* @param buf where the reader should write the data
* @param emsg location for the reader to store an error message
- * @return number of bytes written, usually "max", 0 on error
+ * @return number of bytes written, usually @a max, 0 on error
*/
size_t
-GNUNET_FS_data_reader_file_ (void *cls, uint64_t offset, size_t max, void *buf,
+GNUNET_FS_data_reader_file_ (void *cls,
+ uint64_t offset,
+ size_t max,
+ void *buf,
char **emsg)
{
struct FileInfo *fi = cls;
ssize_t ret;
- if (max == 0)
+ if (UINT64_MAX == offset)
+ {
+ if (NULL != fi->fd)
+ {
+ GNUNET_DISK_file_close (fi->fd);
+ fi->fd = NULL;
+ }
+ return 0;
+ }
+ if (0 == max)
{
- if (fi->fd != NULL)
+ if (NULL != fi->fd)
GNUNET_DISK_file_close (fi->fd);
GNUNET_free (fi->filename);
GNUNET_free (fi);
return 0;
}
- if (fi->fd == NULL)
+ if (NULL == fi->fd)
{
fi->fd =
- GNUNET_DISK_file_open (fi->filename, GNUNET_DISK_OPEN_READ,
+ GNUNET_DISK_file_open (fi->filename,
+ GNUNET_DISK_OPEN_READ,
GNUNET_DISK_PERM_NONE);
- if (fi->fd == NULL)
+ if (NULL == fi->fd)
{
- GNUNET_asprintf (emsg, _("Could not open file `%s': %s"), fi->filename,
+ GNUNET_asprintf (emsg,
+ _("Could not open file `%s': %s"),
+ fi->filename,
STRERROR (errno));
return 0;
}
}
- GNUNET_DISK_file_seek (fi->fd, offset, GNUNET_DISK_SEEK_SET);
- ret = GNUNET_DISK_file_read (fi->fd, buf, max);
- if (ret == -1)
+ if ( (GNUNET_SYSERR ==
+ GNUNET_DISK_file_seek (fi->fd, offset, GNUNET_DISK_SEEK_SET)) ||
+ (-1 == (ret = GNUNET_DISK_file_read (fi->fd, buf, max))) )
{
- GNUNET_asprintf (emsg, _("Could not read file `%s': %s"), fi->filename,
+ GNUNET_asprintf (emsg,
+ _("Could not read file `%s': %s"),
+ fi->filename,
STRERROR (errno));
return 0;
}
if (ret != max)
{
- GNUNET_asprintf (emsg, _("Short read reading from file `%s'!"),
+ GNUNET_asprintf (emsg,
+ _("Short read reading from file `%s'!"),
fi->filename);
return 0;
}
/**
- * Create the closure for the 'GNUNET_FS_data_reader_file_' callback.
+ * Create the closure for the #GNUNET_FS_data_reader_file_() callback.
*
* @param filename file to read
* @return closure to use, NULL on error
{
struct FileInfo *fi;
- fi = GNUNET_malloc (sizeof (struct FileInfo));
+ fi = GNUNET_new (struct FileInfo);
fi->filename = GNUNET_STRINGS_filename_expand (filename);
- if (fi->filename == NULL)
+ if (NULL == fi->filename)
{
GNUNET_free (fi);
return NULL;
* @param cls closure (points to the buffer)
* @param offset offset to read from; it is possible
* that the caller might need to go backwards
- * a bit at times
+ * a bit at times; set to `UINT64_MAX` to tell
+ * the reader that we won't be reading for a while
+ * (used to close the file descriptor but NOT fully
+ * clean up the reader's state); in this case,
+ * a value of '0' for @a max should be ignored
* @param max maximum number of bytes that should be
- * copied to buf; readers are not allowed
+ * copied to @a buf; readers are not allowed
* to provide less data unless there is an error;
* a value of "0" will be used at the end to allow
* the reader to clean up its internal state
* @param buf where the reader should write the data
* @param emsg location for the reader to store an error message
- * @return number of bytes written, usually "max", 0 on error
+ * @return number of bytes written, usually @a max, 0 on error
*/
size_t
-GNUNET_FS_data_reader_copy_ (void *cls, uint64_t offset, size_t max, void *buf,
+GNUNET_FS_data_reader_copy_ (void *cls,
+ uint64_t offset,
+ size_t max,
+ void *buf,
char **emsg)
{
char *data = cls;
- if (max == 0)
+ if (UINT64_MAX == offset)
+ return 0;
+ if (0 == max)
{
GNUNET_free_non_null (data);
return 0;
* @return NULL on error
*/
static char *
-get_serialization_file_name (struct GNUNET_FS_Handle *h, const char *ext,
+get_serialization_file_name (struct GNUNET_FS_Handle *h,
+ const char *ext,
const char *ent)
{
char *basename;
* @return NULL on error
*/
static char *
-get_serialization_file_name_in_dir (struct GNUNET_FS_Handle *h, const char *ext,
- const char *uni, const char *ent)
+get_serialization_file_name_in_dir (struct GNUNET_FS_Handle *h,
+ const char *ext,
+ const char *uni,
+ const char *ent)
{
char *basename;
char *ret;
* @return NULL on error
*/
static struct GNUNET_BIO_ReadHandle *
-get_read_handle (struct GNUNET_FS_Handle *h, const char *ext, const char *ent)
+get_read_handle (struct GNUNET_FS_Handle *h,
+ const char *ext,
+ const char *ent)
{
char *fn;
struct GNUNET_BIO_ReadHandle *ret;
fn = get_serialization_file_name (h, ext, ent);
- if (fn == NULL)
+ if (NULL == fn)
return NULL;
ret = GNUNET_BIO_read_open (fn);
GNUNET_free (fn);
* @return NULL on error
*/
static struct GNUNET_BIO_WriteHandle *
-get_write_handle (struct GNUNET_FS_Handle *h, const char *ext, const char *ent)
+get_write_handle (struct GNUNET_FS_Handle *h,
+ const char *ext,
+ const char *ent)
{
char *fn;
struct GNUNET_BIO_WriteHandle *ret;
fn = get_serialization_file_name (h, ext, ent);
- if (fn == NULL)
- {
+ if (NULL == fn)
return NULL;
- }
ret = GNUNET_BIO_write_open (fn);
- if (ret == NULL)
- GNUNET_break (0);
+ GNUNET_break (NULL != ret);
GNUNET_free (fn);
return ret;
}
struct GNUNET_BIO_WriteHandle *ret;
fn = get_serialization_file_name_in_dir (h, ext, uni, ent);
- if (fn == NULL)
+ if (NULL == fn)
return NULL;
ret = GNUNET_BIO_write_open (fn);
GNUNET_free (fn);
* @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;
return;
}
filename = get_serialization_file_name (h, ext, ent);
- if (filename != NULL)
+ 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 ent entity identifier
*/
static void
-remove_sync_file_in_dir (struct GNUNET_FS_Handle *h, const char *ext,
+remove_sync_file_in_dir (struct GNUNET_FS_Handle *h,
+ const char *ext,
const char *uni, const char *ent)
{
char *filename;
return;
}
filename = get_serialization_file_name_in_dir (h, ext, uni, ent);
- if (filename != NULL)
- {
- if (0 != UNLINK (filename))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", filename);
- GNUNET_free (filename);
- }
+ if (NULL == filename)
+ return;
+ if (0 != UNLINK (filename))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", filename);
+ GNUNET_free (filename);
}
* @param uni unique name of parent
*/
void
-GNUNET_FS_remove_sync_dir_ (struct GNUNET_FS_Handle *h, const char *ext,
+GNUNET_FS_remove_sync_dir_ (struct GNUNET_FS_Handle *h,
+ const char *ext,
const char *uni)
{
char *dn;
- if (uni == NULL)
+ if (NULL == uni)
return;
dn = get_serialization_file_name_in_dir (h, ext, uni, "");
- if (dn == NULL)
+ if (NULL == dn)
return;
- if ((GNUNET_OK == GNUNET_DISK_directory_test (dn)) &&
+ if ((GNUNET_YES == GNUNET_DISK_directory_test (dn, GNUNET_YES)) &&
(GNUNET_OK != GNUNET_DISK_directory_remove (dn)))
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "rmdir", dn);
GNUNET_free (dn);
/**
- * Serialize a 'start_time'. Since we use start-times to
+ * Serialize a start-time. Since we use start-times to
* calculate the duration of some operation, we actually
* do not serialize the absolute time but the (relative)
* duration since the start time. When we then
*
* @param wh handle for writing
* @param timestamp time to serialize
- * @return GNUNET_OK on success
+ * @return #GNUNET_OK on success
*/
static int
write_start_time (struct GNUNET_BIO_WriteHandle *wh,
struct GNUNET_TIME_Relative dur;
dur = GNUNET_TIME_absolute_get_duration (timestamp);
- return GNUNET_BIO_write_int64 (wh, dur.rel_value);
+ return GNUNET_BIO_write_int64 (wh, dur.rel_value_us);
}
/**
- * Serialize a 'start_time'. Since we use start-times to
+ * Deserialize a start-time. Since we use start-times to
* calculate the duration of some operation, we actually
* do not serialize the absolute time but the (relative)
- * duration since the start time. When we then
+ * duration since the start time. Thus, when we then
* deserialize the start time, we take the current time and
* subtract that duration so that we get again an absolute
* time stamp that will result in correct performance
*
* @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,
{
struct GNUNET_TIME_Relative dur;
- if (GNUNET_OK != GNUNET_BIO_read_int64 (rh, &dur.rel_value))
+ if (GNUNET_OK != GNUNET_BIO_read_int64 (rh, &dur.rel_value_us))
return GNUNET_SYSERR;
*timestamp = GNUNET_TIME_absolute_subtract (GNUNET_TIME_absolute_get (), dur);
return GNUNET_OK;
* @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);
/**
* @return NULL on error
*/
static struct GNUNET_FS_FileInformation *
-deserialize_fi_node (struct GNUNET_FS_Handle *h, const char *fn,
+deserialize_fi_node (struct GNUNET_FS_Handle *h,
+ const char *fn,
struct GNUNET_BIO_ReadHandle *rh)
{
struct GNUNET_FS_FileInformation *ret;
char b;
char *ksks;
char *chks;
+ char *skss;
char *filename;
uint32_t dsize;
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;
+ skss = NULL;
filename = NULL;
if ((GNUNET_OK != GNUNET_BIO_read_meta_data (rh, "metadata", &ret->meta)) ||
(GNUNET_OK != GNUNET_BIO_read_string (rh, "ksk-uri", &ksks, 32 * 1024)) ||
( (NULL != chks) &&
( (NULL == (ret->chk_uri = GNUNET_FS_uri_parse (chks, NULL))) ||
(GNUNET_YES != GNUNET_FS_uri_test_chk (ret->chk_uri))) ) ||
+ (GNUNET_OK != GNUNET_BIO_read_string (rh, "sks-uri", &skss, 1024)) ||
+ ( (NULL != skss) &&
+ ( (NULL == (ret->sks_uri = GNUNET_FS_uri_parse (skss, NULL))) ||
+ (GNUNET_YES != GNUNET_FS_uri_test_sks (ret->sks_uri))) ) ||
(GNUNET_OK != read_start_time (rh, &ret->start_time)) ||
(GNUNET_OK != GNUNET_BIO_read_string (rh, "emsg", &ret->emsg, 16 * 1024))
|| (GNUNET_OK !=
GNUNET_BIO_read_string (rh, "fn", &ret->filename, 16 * 1024)) ||
(GNUNET_OK !=
- GNUNET_BIO_read_int64 (rh, &ret->bo.expiration_time.abs_value)) ||
+ GNUNET_BIO_read_int64 (rh, &ret->bo.expiration_time.abs_value_us)) ||
(GNUNET_OK != GNUNET_BIO_read_int32 (rh, &ret->bo.anonymity_level)) ||
(GNUNET_OK != GNUNET_BIO_read_int32 (rh, &ret->bo.content_priority)) ||
(GNUNET_OK != GNUNET_BIO_read_int32 (rh, &ret->bo.replication_level)))
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))))
+ sizeof (struct GNUNET_HashCode))))
{
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))))
+ sizeof (struct GNUNET_HashCode))))
{
GNUNET_break (0);
goto cleanup;
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)) ||
goto cleanup;
}
ret->data.dir.dir_size = (uint32_t) dsize;
- if (filename != NULL)
+ if (NULL != filename)
{
ret->data.dir.entries = deserialize_file_information (h, filename);
GNUNET_free (filename);
filename = NULL;
nxt = ret->data.dir.entries;
- while (nxt != NULL)
+ while (NULL != nxt)
{
nxt->dir = ret;
nxt = nxt->next;
GNUNET_break (0);
goto cleanup;
}
- if (filename != NULL)
+ if (NULL != filename)
{
ret->next = deserialize_file_information (h, filename);
GNUNET_free (filename);
filename = NULL;
}
GNUNET_free_non_null (ksks);
+ GNUNET_free_non_null (skss);
GNUNET_free_non_null (chks);
return ret;
cleanup:
GNUNET_free_non_null (ksks);
GNUNET_free_non_null (chks);
+ GNUNET_free_non_null (skss);
GNUNET_free_non_null (filename);
GNUNET_FS_file_information_destroy (ret, NULL, NULL);
return NULL;
* @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;
char *emsg;
+ char *fn;
rh = get_read_handle (h, GNUNET_FS_SYNC_PATH_FILE_INFO, filename);
- if (rh == NULL)
+ if (NULL == rh)
return NULL;
ret = deserialize_fi_node (h, filename, rh);
if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg))
filename, emsg);
GNUNET_free (emsg);
}
- if (ret == NULL)
+ if (NULL == ret)
{
- if (0 != UNLINK (filename))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", filename);
+ fn = get_serialization_file_name (h, GNUNET_FS_SYNC_PATH_FILE_INFO, filename);
+ if (NULL != fn)
+ {
+ if (0 != UNLINK (fn))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", fn);
+ GNUNET_free (fn);
+ }
}
return ret;
}
end = nxt + 1;
nxt++;
}
- if ((end == NULL) || (strlen (end) == 0))
+ if ((NULL == end) || (0 == strlen (end)))
{
GNUNET_break (0);
return NULL;
* @return NULL on errror
*/
static char *
-make_serialization_file_name (struct GNUNET_FS_Handle *h, const char *ext)
+make_serialization_file_name (struct GNUNET_FS_Handle *h,
+ const char *ext)
{
char *fn;
char *dn;
if (0 == (h->flags & GNUNET_FS_FLAGS_PERSISTENCE))
return NULL; /* persistence not requested */
dn = get_serialization_file_name (h, ext, "");
- if (dn == NULL)
+ if (NULL == dn)
return NULL;
if (GNUNET_OK != GNUNET_DISK_directory_create_for_file (dn))
{
}
fn = GNUNET_DISK_mktemp (dn);
GNUNET_free (dn);
- if (fn == NULL)
+ if (NULL == fn)
return NULL; /* epic fail */
ret = get_serialization_short_name (fn);
GNUNET_free (fn);
*/
static char *
make_serialization_file_name_in_dir (struct GNUNET_FS_Handle *h,
- const char *ext, const char *uni)
+ const char *ext,
+ const char *uni)
{
char *fn;
char *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)
+ if (NULL == dn)
return NULL;
if (GNUNET_OK != GNUNET_DISK_directory_create_for_file (dn))
{
}
fn = GNUNET_DISK_mktemp (dn);
GNUNET_free (dn);
- if (fn == NULL)
+ if (NULL == fn)
return NULL; /* epic fail */
ret = get_serialization_short_name (fn);
GNUNET_free (fn);
*
* @param wh write handle
* @param fi file with reader
- * @return GNUNET_OK on success
+ * @return #GNUNET_OK on success
*/
static int
copy_from_reader (struct GNUNET_BIO_WriteHandle *wh,
left = GNUNET_MIN (sizeof (buf), fi->data.file.file_size - off);
ret =
fi->data.file.reader (fi->data.file.reader_cls, off, left, buf, &emsg);
- if (ret == 0)
+ if (0 == ret)
{
GNUNET_free (emsg);
return GNUNET_SYSERR;
/**
* Create a temporary file on disk to store the current
- * state of "fi" in.
+ * state of @a fi in.
*
* @param fi file information to sync with disk
*/
char b;
char *ksks;
char *chks;
+ char *skss;
if (NULL == fi->serialization)
fi->serialization =
return;
wh = get_write_handle (fi->h, GNUNET_FS_SYNC_PATH_FILE_INFO,
fi->serialization);
- if (wh == NULL)
+ if (NULL == wh)
{
GNUNET_free (fi->serialization);
fi->serialization = NULL;
b = 1;
else
b = 0;
- if (fi->keywords != NULL)
+ if (NULL != fi->keywords)
ksks = GNUNET_FS_uri_to_string (fi->keywords);
else
ksks = NULL;
- if (fi->chk_uri != NULL)
+ if (NULL != fi->chk_uri)
chks = GNUNET_FS_uri_to_string (fi->chk_uri);
else
chks = NULL;
+ if (NULL != fi->sks_uri)
+ skss = GNUNET_FS_uri_to_string (fi->sks_uri);
+ else
+ skss = NULL;
if ((GNUNET_OK != GNUNET_BIO_write (wh, &b, sizeof (b))) ||
(GNUNET_OK != GNUNET_BIO_write_meta_data (wh, fi->meta)) ||
(GNUNET_OK != GNUNET_BIO_write_string (wh, ksks)) ||
(GNUNET_OK != GNUNET_BIO_write_string (wh, chks)) ||
+ (GNUNET_OK != GNUNET_BIO_write_string (wh, skss)) ||
(GNUNET_OK != write_start_time (wh, fi->start_time)) ||
(GNUNET_OK != GNUNET_BIO_write_string (wh, fi->emsg)) ||
(GNUNET_OK != GNUNET_BIO_write_string (wh, fi->filename)) ||
(GNUNET_OK !=
- GNUNET_BIO_write_int64 (wh, fi->bo.expiration_time.abs_value)) ||
+ GNUNET_BIO_write_int64 (wh, fi->bo.expiration_time.abs_value_us)) ||
(GNUNET_OK != GNUNET_BIO_write_int32 (wh, fi->bo.anonymity_level)) ||
(GNUNET_OK != GNUNET_BIO_write_int32 (wh, fi->bo.content_priority)) ||
(GNUNET_OK != GNUNET_BIO_write_int32 (wh, fi->bo.replication_level)))
chks = NULL;
GNUNET_free_non_null (ksks);
ksks = NULL;
+ GNUNET_free_non_null (skss);
+ skss = NULL;
switch (b)
{
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))))
+ sizeof (struct GNUNET_HashCode))))
{
GNUNET_break (0);
goto cleanup;
}
break;
case 4: /* directory */
+ if ( (NULL != fi->data.dir.entries) &&
+ (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)) ||
GNUNET_assert (0);
goto cleanup;
}
+ if ( (NULL != fi->next) &&
+ (NULL == fi->next->serialization) )
+ GNUNET_FS_file_information_sync_ (fi->next);
if (GNUNET_OK !=
GNUNET_BIO_write_string (wh,
(fi->next !=
}
return; /* done! */
cleanup:
- if (wh != NULL)
+ if (NULL != wh)
(void) GNUNET_BIO_write_close (wh);
GNUNET_free_non_null (chks);
GNUNET_free_non_null (ksks);
+ GNUNET_free_non_null (skss);
fn = get_serialization_file_name (fi->h, GNUNET_FS_SYNC_PATH_FILE_INFO,
fi->serialization);
if (NULL != fn)
* @return NULL if srch was not found in this subtree
*/
static struct GNUNET_FS_FileInformation *
-find_file_position (struct GNUNET_FS_FileInformation *pos, const char *srch)
+find_file_position (struct GNUNET_FS_FileInformation *pos,
+ const char *srch)
{
struct GNUNET_FS_FileInformation *r;
- while (pos != NULL)
+ while (NULL != pos)
{
if (0 == strcmp (srch, pos->serialization))
return pos;
- if (pos->is_directory == GNUNET_YES)
- {
- r = find_file_position (pos->data.dir.entries, srch);
- if (r != NULL)
- return r;
- }
+ if ( (GNUNET_YES == pos->is_directory) &&
+ (NULL != (r = find_file_position (pos->data.dir.entries, srch))) )
+ return r;
pos = pos->next;
}
return NULL;
* Signal the FS's progress function that we are resuming
* an upload.
*
- * @param cls closure (of type "struct GNUNET_FS_PublishContext*")
+ * @param cls closure (of type `struct GNUNET_FS_PublishContext *`, for the parent (!))
* @param fi the entry in the publish-structure
* @param length length of the file or directory
* @param meta metadata for the file or directory (can be modified)
* @param bo block options (can be modified)
* @param do_index should we index?
* @param client_info pointer to client context set upon creation (can be modified)
- * @return GNUNET_OK to continue (always)
+ * @return #GNUNET_OK to continue (always)
*/
static int
-fip_signal_resume (void *cls, struct GNUNET_FS_FileInformation *fi,
- uint64_t length, struct GNUNET_CONTAINER_MetaData *meta,
+fip_signal_resume (void *cls,
+ struct GNUNET_FS_FileInformation *fi,
+ uint64_t length,
+ struct GNUNET_CONTAINER_MetaData *meta,
struct GNUNET_FS_Uri **uri,
- struct GNUNET_FS_BlockOptions *bo, int *do_index,
+ struct GNUNET_FS_BlockOptions *bo,
+ int *do_index,
void **client_info)
{
struct GNUNET_FS_PublishContext *pc = cls;
return GNUNET_OK;
}
pi.status = GNUNET_FS_STATUS_PUBLISH_RESUME;
- pi.value.publish.specifics.resume.message = pc->fi->emsg;
- pi.value.publish.specifics.resume.chk_uri = pc->fi->chk_uri;
+ pi.value.publish.specifics.resume.message = fi->emsg;
+ pi.value.publish.specifics.resume.chk_uri = fi->chk_uri;
*client_info = GNUNET_FS_publish_make_status_ (&pi, pc, fi, 0);
if (GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (meta))
{
* Function called with a filename of serialized publishing operation
* to deserialize.
*
- * @param cls the 'struct GNUNET_FS_Handle*'
+ * @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_publish_file (void *cls, const char *filename)
+deserialize_publish_file (void *cls,
+ const char *filename)
{
struct GNUNET_FS_Handle *h = cls;
struct GNUNET_BIO_ReadHandle *rh;
struct GNUNET_FS_PublishContext *pc;
int32_t options;
int32_t all_done;
+ int32_t have_ns;
char *fi_root;
- char *ns;
+ struct GNUNET_CRYPTO_EcdsaPrivateKey ns;
char *fi_pos;
char *emsg;
- pc = GNUNET_malloc (sizeof (struct GNUNET_FS_PublishContext));
+ pc = GNUNET_new (struct GNUNET_FS_PublishContext);
pc->h = h;
pc->serialization = get_serialization_short_name (filename);
fi_root = NULL;
fi_pos = NULL;
- ns = NULL;
rh = GNUNET_BIO_read_open (filename);
- if (rh == NULL)
+ if (NULL == rh)
{
GNUNET_break (0);
goto cleanup;
GNUNET_BIO_read_string (rh, "publish-nuid", &pc->nuid, 1024)) ||
(GNUNET_OK != GNUNET_BIO_read_int32 (rh, &options)) ||
(GNUNET_OK != GNUNET_BIO_read_int32 (rh, &all_done)) ||
+ (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &have_ns)) ||
(GNUNET_OK !=
GNUNET_BIO_read_string (rh, "publish-firoot", &fi_root, 128)) ||
(GNUNET_OK != GNUNET_BIO_read_string (rh, "publish-fipos", &fi_pos, 128))
- || (GNUNET_OK != GNUNET_BIO_read_string (rh, "publish-ns", &ns, 1024)))
+ || ( (GNUNET_YES == have_ns) &&
+ (GNUNET_OK != GNUNET_BIO_read (rh, "publish-ns", &ns, sizeof (ns)))) )
{
GNUNET_break (0);
goto cleanup;
goto cleanup;
}
pc->fi = deserialize_file_information (h, fi_root);
- if (pc->fi == NULL)
+ if (NULL == pc->fi)
{
GNUNET_break (0);
goto cleanup;
}
- if (ns != NULL)
+ if (GNUNET_YES == have_ns)
{
- pc->namespace = GNUNET_FS_namespace_create (h, ns);
- if (pc->namespace == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _
- ("Failed to recover namespace `%s', cannot resume publishing operation.\n"),
- ns);
- goto cleanup;
- }
+ pc->ns = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPrivateKey);
+ *pc->ns = ns;
}
if ((0 == (pc->options & GNUNET_FS_PUBLISH_OPTION_SIMULATE_ONLY)) &&
(GNUNET_YES != pc->all_done))
if (NULL == pc->dsh)
goto cleanup;
}
- if (fi_pos != NULL)
+ if (NULL != fi_pos)
{
pc->fi_pos = find_file_position (pc->fi, fi_pos);
GNUNET_free (fi_pos);
fi_pos = NULL;
- if (pc->fi_pos == NULL)
+ if (NULL == pc->fi_pos)
{
/* failed to find position for resuming, outch! Will start from root! */
GNUNET_break (0);
- if (pc->all_done != GNUNET_YES)
+ if (GNUNET_YES != pc->all_done)
pc->fi_pos = pc->fi;
}
}
GNUNET_FS_file_information_inspect (pc->fi, &fip_signal_resume, pc);
/* re-start publishing (if needed)... */
- if (pc->all_done != GNUNET_YES)
+ if (GNUNET_YES != pc->all_done)
{
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pc->upload_task);
+ GNUNET_assert (NULL == 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))
filename, emsg);
GNUNET_free (emsg);
}
- GNUNET_free_non_null (ns);
pc->top = GNUNET_FS_make_top (h, &GNUNET_FS_publish_signal_suspend_, pc);
return GNUNET_OK;
cleanup:
GNUNET_free_non_null (pc->nuid);
GNUNET_free_non_null (fi_root);
GNUNET_free_non_null (fi_pos);
- GNUNET_free_non_null (ns);
- if ((rh != NULL) && (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)))
+ if ((NULL != rh) && (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("Failed to resume publishing operation `%s': %s\n"), filename,
emsg);
GNUNET_free (emsg);
}
- if (pc->fi != NULL)
+ if (NULL != pc->fi)
GNUNET_FS_file_information_destroy (pc->fi, NULL, NULL);
if (0 != UNLINK (filename))
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", filename);
GNUNET_FS_publish_sync_ (struct GNUNET_FS_PublishContext *pc)
{
struct GNUNET_BIO_WriteHandle *wh;
+ int32_t have_ns;
if (NULL == pc->serialization)
pc->serialization =
}
wh = get_write_handle (pc->h, GNUNET_FS_SYNC_PATH_MASTER_PUBLISH,
pc->serialization);
- if (wh == NULL)
+ if (NULL == wh)
{
GNUNET_break (0);
goto cleanup;
}
+ have_ns = (NULL != pc->ns) ? GNUNET_YES : GNUNET_NO;
if ((GNUNET_OK != GNUNET_BIO_write_string (wh, pc->nid)) ||
(GNUNET_OK != GNUNET_BIO_write_string (wh, pc->nuid)) ||
(GNUNET_OK != GNUNET_BIO_write_int32 (wh, pc->options)) ||
(GNUNET_OK != GNUNET_BIO_write_int32 (wh, pc->all_done)) ||
+ (GNUNET_OK != GNUNET_BIO_write_int32 (wh, have_ns)) ||
(GNUNET_OK != GNUNET_BIO_write_string (wh, pc->fi->serialization)) ||
(GNUNET_OK !=
GNUNET_BIO_write_string (wh,
- (pc->fi_pos ==
- NULL) ? NULL : pc->fi_pos->serialization)) ||
- (GNUNET_OK !=
- GNUNET_BIO_write_string (wh,
- (pc->namespace ==
- NULL) ? NULL : pc->namespace->name)))
+ (NULL == pc->fi_pos) ? NULL : pc->fi_pos->serialization)) ||
+ ( (NULL != pc->ns) &&
+ (GNUNET_OK != GNUNET_BIO_write (wh,
+ pc->ns,
+ sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)) ) ))
{
GNUNET_break (0);
goto cleanup;
}
return;
cleanup:
- if (wh != NULL)
+ if (NULL != wh)
(void) GNUNET_BIO_write_close (wh);
GNUNET_FS_remove_sync_file_ (pc->h, GNUNET_FS_SYNC_PATH_MASTER_PUBLISH,
pc->serialization);
GNUNET_FS_unindex_sync_ (struct GNUNET_FS_UnindexContext *uc)
{
struct GNUNET_BIO_WriteHandle *wh;
+ char *uris;
if (NULL == uc->serialization)
uc->serialization =
return;
wh = get_write_handle (uc->h, GNUNET_FS_SYNC_PATH_MASTER_UNINDEX,
uc->serialization);
- if (wh == NULL)
+ if (NULL == wh)
{
GNUNET_break (0);
goto cleanup;
}
+ if (NULL != uc->ksk_uri)
+ uris = GNUNET_FS_uri_to_string (uc->ksk_uri);
+ else
+ uris = NULL;
if ((GNUNET_OK != GNUNET_BIO_write_string (wh, uc->filename)) ||
(GNUNET_OK != GNUNET_BIO_write_int64 (wh, uc->file_size)) ||
(GNUNET_OK != write_start_time (wh, uc->start_time)) ||
(GNUNET_OK != GNUNET_BIO_write_int32 (wh, (uint32_t) uc->state)) ||
+ (GNUNET_OK !=
+ GNUNET_BIO_write (wh, &uc->chk, sizeof (struct ContentHashKey))) ||
+ (GNUNET_OK != GNUNET_BIO_write_string (wh, uris)) ||
+ (GNUNET_OK != GNUNET_BIO_write_int32 (wh, (uint32_t) uc->ksk_offset)) ||
((uc->state == UNINDEX_STATE_FS_NOTIFY) &&
(GNUNET_OK !=
- GNUNET_BIO_write (wh, &uc->file_id, sizeof (GNUNET_HashCode)))) ||
+ GNUNET_BIO_write (wh, &uc->file_id, sizeof (struct GNUNET_HashCode)))) ||
((uc->state == UNINDEX_STATE_ERROR) &&
(GNUNET_OK != GNUNET_BIO_write_string (wh, uc->emsg))))
{
}
return;
cleanup:
- if (wh != NULL)
+ if (NULL != wh)
(void) GNUNET_BIO_write_close (wh);
GNUNET_FS_remove_sync_file_ (uc->h, GNUNET_FS_SYNC_PATH_MASTER_UNINDEX,
uc->serialization);
/**
* 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 handle for writing the download request to disk
+ * @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,
(GNUNET_OK != GNUNET_BIO_write_int32 (wh, dr->num_children)) ||
(GNUNET_OK != GNUNET_BIO_write_int32 (wh, dr->depth)))
return GNUNET_NO;
- if ((dr->state == BRS_CHK_SET) &&
+ if ((BRS_CHK_SET == dr->state) &&
(GNUNET_OK !=
GNUNET_BIO_write (wh, &dr->chk, sizeof (struct ContentHashKey))))
return GNUNET_NO;
/**
* Read a download request tree.
*
- * @param rh stream to read from
- * @return value the 'struct DownloadRequest', NULL on error
+ * @param rh cadet to read from
+ * @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)) ||
(dr->num_children > CHK_PER_INODE) ||
- (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &dr->depth)) || ((dr->depth == 0)
- &&
- (dr->num_children
- > 0)) ||
- ((dr->depth > 0) && (dr->num_children == 0)))
+ (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &dr->depth)) ||
+ ( (0 == dr->depth) &&
+ (dr->num_children > 0) ) ||
+ ((dr->depth > 0) && (0 == dr->num_children)))
{
GNUNET_break (0);
dr->num_children = 0;
}
if (dr->num_children > 0)
dr->children =
- GNUNET_malloc (dr->num_children * sizeof (struct ContentHashKey));
+ GNUNET_malloc (dr->num_children * sizeof (struct DownloadRequest *));
switch (dr->state)
{
case BRS_INIT:
*/
static char *
get_download_sync_filename (struct GNUNET_FS_DownloadContext *dc,
- const char *uni, const char *ext)
+ const char *uni,
+ const char *ext)
{
char *par;
char *epar;
if (dc->parent == NULL)
return get_serialization_file_name (dc->h,
- (dc->search !=
- NULL) ?
- GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD :
+ (dc->search != NULL) ?
+ GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD :
GNUNET_FS_SYNC_PATH_MASTER_DOWNLOAD,
uni);
- if (dc->parent->serialization == NULL)
+ if (NULL == dc->parent->serialization)
return NULL;
par = get_download_sync_filename (dc->parent, dc->parent->serialization, "");
- if (par == NULL)
+ if (NULL == par)
return NULL;
GNUNET_asprintf (&epar, "%s.dir%s%s%s", par, DIR_SEPARATOR_STR, uni, ext);
GNUNET_free (par);
char *fn;
char *dir;
+ if (0 != (dc->options & GNUNET_FS_DOWNLOAD_IS_PROBE))
+ return; /* we don't sync probes */
if (NULL == dc->serialization)
{
dir = get_download_sync_filename (dc, "", "");
- if (dir == NULL)
+ if (NULL == dir)
return;
if (GNUNET_OK != GNUNET_DISK_directory_create_for_file (dir))
{
}
fn = GNUNET_DISK_mktemp (dir);
GNUNET_free (dir);
- if (fn == NULL)
+ if (NULL == fn)
return;
dc->serialization = get_serialization_short_name (fn);
}
else
{
fn = get_download_sync_filename (dc, dc->serialization, "");
- if (fn == NULL)
+ if (NULL == fn)
{
GNUNET_free (dc->serialization);
dc->serialization = NULL;
}
}
wh = GNUNET_BIO_write_open (fn);
- if (wh == NULL)
+ if (NULL == wh)
{
GNUNET_free (dc->serialization);
dc->serialization = NULL;
struct GNUNET_BIO_WriteHandle *wh;
char *uris;
+ if (NULL == sr->sc)
+ return;
uris = NULL;
if (NULL == sr->serialization)
sr->serialization =
- make_serialization_file_name_in_dir (sr->sc->h,
+ make_serialization_file_name_in_dir (sr->h,
(sr->sc->psearch_result ==
NULL) ?
GNUNET_FS_SYNC_PATH_MASTER_SEARCH :
sr->sc->serialization);
if (NULL == sr->serialization)
return;
- wh = get_write_handle_in_dir (sr->sc->h,
+ wh = get_write_handle_in_dir (sr->h,
(sr->sc->psearch_result ==
NULL) ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH :
GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
sr->sc->serialization, sr->serialization);
- if (wh == NULL)
+ if (NULL == wh)
{
GNUNET_break (0);
goto cleanup;
sr->update_search !=
NULL ? sr->update_search->serialization : NULL))
|| (GNUNET_OK != GNUNET_BIO_write_meta_data (wh, sr->meta)) ||
- (GNUNET_OK != GNUNET_BIO_write (wh, &sr->key, sizeof (GNUNET_HashCode)))
+ (GNUNET_OK != GNUNET_BIO_write (wh, &sr->key, sizeof (struct GNUNET_HashCode)))
|| (GNUNET_OK != GNUNET_BIO_write_int32 (wh, sr->mandatory_missing)) ||
(GNUNET_OK != GNUNET_BIO_write_int32 (wh, sr->optional_support)) ||
(GNUNET_OK != GNUNET_BIO_write_int32 (wh, sr->availability_success)) ||
GNUNET_break (0);
goto cleanup;
}
- if ( (sr->uri != NULL) &&
- (sr->sc->uri->type == ksk) &&
+ if ( (NULL != sr->uri) &&
+ (GNUNET_FS_URI_KSK == sr->sc->uri->type) &&
(GNUNET_OK != GNUNET_BIO_write (wh, sr->keyword_bitmap,
(sr->sc->uri->data.ksk.keywordCount + 7) / 8)) )
{
return;
cleanup:
GNUNET_free_non_null (uris);
- if (wh != NULL)
+ if (NULL != wh)
(void) GNUNET_BIO_write_close (wh);
- remove_sync_file_in_dir (sr->sc->h,
- (sr->sc->psearch_result ==
- NULL) ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH :
- GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
+ remove_sync_file_in_dir (sr->h,
+ (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);
sr->serialization = NULL;
const char *category;
category =
- (sc->psearch_result ==
- NULL) ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH :
- GNUNET_FS_SYNC_PATH_CHILD_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);
if (NULL == sc->serialization)
return;
uris = NULL;
wh = get_write_handle (sc->h, category, sc->serialization);
- if (wh == NULL)
+ if (NULL == wh)
{
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);
- in_pause = (sc->task != GNUNET_SCHEDULER_NO_TASK) ? 'r' : '\0';
+ in_pause = (sc->task != NULL) ? 'r' : '\0';
if ((GNUNET_OK != GNUNET_BIO_write_string (wh, uris)) ||
(GNUNET_OK != write_start_time (wh, sc->start_time)) ||
(GNUNET_OK != GNUNET_BIO_write_string (wh, sc->emsg)) ||
}
return;
cleanup:
- if (wh != NULL)
+ if (NULL != wh)
(void) GNUNET_BIO_write_close (wh);
GNUNET_free_non_null (uris);
GNUNET_FS_remove_sync_file_ (sc->h, category, sc->serialization);
* Function called with a filename of serialized unindexing operation
* to deserialize.
*
- * @param cls the 'struct GNUNET_FS_Handle*'
+ * @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_unindex_file (void *cls, const char *filename)
+deserialize_unindex_file (void *cls,
+ const char *filename)
{
struct GNUNET_FS_Handle *h = cls;
struct GNUNET_BIO_ReadHandle *rh;
struct GNUNET_FS_UnindexContext *uc;
struct GNUNET_FS_ProgressInfo pi;
char *emsg;
+ 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);
- if (rh == NULL)
+ if (NULL == rh)
{
GNUNET_break (0);
goto cleanup;
}
+ uris = NULL;
if ((GNUNET_OK !=
GNUNET_BIO_read_string (rh, "unindex-fn", &uc->filename, 10 * 1024)) ||
(GNUNET_OK != GNUNET_BIO_read_int64 (rh, &uc->file_size)) ||
(GNUNET_OK != read_start_time (rh, &uc->start_time)) ||
- (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &state)))
+ (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &state)) ||
+ (GNUNET_OK != GNUNET_BIO_read (rh, "uri", &uc->chk, sizeof (struct ContentHashKey))) ||
+ (GNUNET_OK != GNUNET_BIO_read_string (rh, "unindex-kskuri", &uris, 10 * 1024)) ||
+ (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &uc->ksk_offset)) )
+ {
+ GNUNET_free_non_null (uris);
+ GNUNET_break (0);
+ goto cleanup;
+ }
+ if (NULL != uris)
+ {
+ uc->ksk_uri = GNUNET_FS_uri_parse (uris, &emsg);
+ GNUNET_free (uris);
+ if (NULL == uc->ksk_uri)
+ {
+ GNUNET_break (0);
+ GNUNET_free_non_null (emsg);
+ goto cleanup;
+ }
+ }
+ if ( (uc->ksk_offset > 0) &&
+ ( (NULL == uc->ksk_uri) ||
+ (uc->ksk_offset > uc->ksk_uri->data.ksk.keywordCount) ) )
{
GNUNET_break (0);
goto cleanup;
case UNINDEX_STATE_FS_NOTIFY:
if (GNUNET_OK !=
GNUNET_BIO_read (rh, "unindex-hash", &uc->file_id,
- sizeof (GNUNET_HashCode)))
+ sizeof (struct GNUNET_HashCode)))
{
GNUNET_break (0);
goto cleanup;
}
break;
case UNINDEX_STATE_DS_REMOVE:
+ case UNINDEX_STATE_EXTRACT_KEYWORDS:
+ case UNINDEX_STATE_DS_REMOVE_KBLOCKS:
break;
case UNINDEX_STATE_COMPLETE:
break;
case UNINDEX_STATE_DS_REMOVE:
GNUNET_FS_unindex_do_remove_ (uc);
break;
+ case UNINDEX_STATE_EXTRACT_KEYWORDS:
+ GNUNET_FS_unindex_do_extract_keywords_ (uc);
+ break;
+ case UNINDEX_STATE_DS_REMOVE_KBLOCKS:
+ GNUNET_FS_unindex_do_remove_kblocks_ (uc);
+ break;
case UNINDEX_STATE_COMPLETE:
case UNINDEX_STATE_ERROR:
/* no need to resume any operation, we were done */
return GNUNET_OK;
cleanup:
GNUNET_free_non_null (uc->filename);
- if ((rh != NULL) && (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)))
+ if ((NULL != rh) && (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to resume unindexing operation `%s': %s\n"), filename,
+ _("Failed to resume unindexing operation `%s': %s\n"),
+ filename,
emsg);
GNUNET_free (emsg);
}
- if (uc->serialization != NULL)
+ if (NULL != uc->serialization)
GNUNET_FS_remove_sync_file_ (h, GNUNET_FS_SYNC_PATH_MASTER_UNINDEX,
uc->serialization);
GNUNET_free_non_null (uc->serialization);
* Function called with a filename of serialized search result
* to deserialize.
*
- * @param cls the 'struct GNUNET_FS_SearchContext*'
+ * @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)
+deserialize_search_result (void *cls,
+ const char *filename)
{
struct GNUNET_FS_SearchContext *sc = cls;
char *ser;
ser = get_serialization_short_name (filename);
rh = GNUNET_BIO_read_open (filename);
- if (rh == NULL)
+ if (NULL == rh)
{
- if (ser != NULL)
+ if (NULL != ser)
{
remove_sync_file_in_dir (sc->h,
- (sc->psearch_result ==
- NULL) ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH :
- GNUNET_FS_SYNC_PATH_CHILD_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;
if ((GNUNET_OK != GNUNET_BIO_read_string (rh, "result-uri", &uris, 10 * 1024))
GNUNET_BIO_read_string (rh, "search-lnk", &update_srch, 16)) ||
(GNUNET_OK != GNUNET_BIO_read_meta_data (rh, "result-meta", &sr->meta)) ||
(GNUNET_OK !=
- GNUNET_BIO_read (rh, "result-key", &sr->key, sizeof (GNUNET_HashCode)))
+ GNUNET_BIO_read (rh, "result-key", &sr->key, sizeof (struct GNUNET_HashCode)))
|| (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &sr->mandatory_missing)) ||
(GNUNET_OK != GNUNET_BIO_read_int32 (rh, &sr->optional_support)) ||
(GNUNET_OK != GNUNET_BIO_read_int32 (rh, &sr->availability_success)) ||
GNUNET_break (0);
goto cleanup;
}
- if (sr->sc->uri->type == ksk)
+ if (GNUNET_FS_URI_KSK == sr->sc->uri->type)
{
sr->keyword_bitmap = GNUNET_malloc ((sr->sc->uri->data.ksk.keywordCount + 7) / 8); /* round up, count bits */
if (GNUNET_OK != GNUNET_BIO_read (rh, "keyword-bitmap",
}
}
GNUNET_free (uris);
- if (download != NULL)
+ if (NULL != download)
{
drh = get_read_handle (sc->h, GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD, download);
- if (drh != NULL)
+ if (NULL != drh)
{
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,
+ _("Failed to resume sub-download `%s': %s\n"),
+ download,
emsg);
GNUNET_free (emsg);
}
}
GNUNET_free (download);
}
- if (update_srch != NULL)
+ if (NULL != update_srch)
{
drh =
get_read_handle (sc->h, GNUNET_FS_SYNC_PATH_CHILD_SEARCH, update_srch);
- if (drh != NULL)
+ if (NULL != drh)
{
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,
+ _("Failed to resume sub-search `%s': %s\n"),
+ update_srch,
emsg);
GNUNET_free (emsg);
}
}
GNUNET_free (update_srch);
}
- GNUNET_CONTAINER_multihashmap_put (sc->master_result_map, &sr->key, sr,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ GNUNET_break (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_put (sc->master_result_map,
+ &sr->key, sr,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
GNUNET_free_non_null (emsg);
GNUNET_free_non_null (uris);
GNUNET_free_non_null (update_srch);
- if (sr->uri != NULL)
+ if (NULL != sr->uri)
GNUNET_FS_uri_destroy (sr->uri);
- if (sr->meta != NULL)
+ if (NULL != sr->meta)
GNUNET_CONTAINER_meta_data_destroy (sr->meta);
GNUNET_free (sr->serialization);
GNUNET_free (sr);
signal_download_resume (dcc);
dcc = dcc->next;
}
- if (dc->pending_head != NULL)
+ if (NULL != dc->pending_head)
GNUNET_FS_download_start_downloading_ (dc);
}
* Iterator over search results signaling resume to the client for
* each result.
*
- * @param cls closure, the 'struct GNUNET_FS_SearchContext'
+ * @param cls closure, the `struct GNUNET_FS_SearchContext *`
* @param key current key code
- * @param value value in the hash map, the 'struct GNUNET_FS_SearchResult'
- * @return GNUNET_YES (we should continue to iterate)
+ * @param value value in the hash map, the `struct GNUNET_FS_SearchResult *`
+ * @return #GNUNET_YES (we should continue to iterate)
*/
static int
-signal_result_resume (void *cls, const GNUNET_HashCode * key, void *value)
+signal_result_resume (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
{
struct GNUNET_FS_SearchContext *sc = cls;
struct GNUNET_FS_ProgressInfo pi;
sr->availability_trials;
pi.value.search.specifics.resume_result.applicability_rank =
sr->optional_support;
- sr->client_info = GNUNET_FS_search_make_status_ (&pi, sc);
+ sr->client_info = GNUNET_FS_search_make_status_ (&pi, sc->h, sc);
}
- if (sr->download != NULL)
+ if (NULL != sr->download)
{
signal_download_resume (sr->download);
}
{
GNUNET_FS_search_start_probe_ (sr);
}
- if (sr->update_search != NULL)
+ if (NULL != sr->update_search)
signal_search_resume (sr->update_search);
return GNUNET_YES;
}
/**
* Iterator over search results freeing each.
*
- * @param cls closure, the 'struct GNUNET_FS_SearchContext'
+ * @param cls closure, the `struct GNUNET_FS_SearchContext *`
* @param key current key code
- * @param value value in the hash map, the 'struct GNUNET_FS_SearchResult'
- * @return GNUNET_YES (we should continue to iterate)
+ * @param value value in the hash map, the `struct GNUNET_FS_SearchResult *`
+ * @return #GNUNET_YES (we should continue to iterate)
*/
static int
-free_result (void *cls, const GNUNET_HashCode * key, void *value)
+free_result (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
{
struct GNUNET_FS_SearchResult *sr = value;
- if (sr->update_search != NULL)
+ if (NULL != sr->update_search)
{
free_search_context (sr->update_search);
GNUNET_assert (NULL == sr->update_search);
static void
free_search_context (struct GNUNET_FS_SearchContext *sc)
{
- if (sc->serialization != NULL)
+ if (NULL != sc->serialization)
{
GNUNET_FS_remove_sync_file_ (sc->h,
(sc->psearch_result ==
}
GNUNET_free_non_null (sc->serialization);
GNUNET_free_non_null (sc->emsg);
- if (sc->uri != NULL)
+ if (NULL != sc->uri)
GNUNET_FS_uri_destroy (sc->uri);
- if (sc->master_result_map != NULL)
+ if (NULL != sc->master_result_map)
{
GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map, &free_result,
sc);
* Function called with a filename of serialized sub-download
* to deserialize.
*
- * @param cls the 'struct GNUNET_FS_DownloadContext*' (parent)
+ * @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)
+deserialize_subdownload (void *cls,
+ const char *filename)
{
struct GNUNET_FS_DownloadContext *parent = cls;
char *ser;
ser = get_serialization_short_name (filename);
rh = GNUNET_BIO_read_open (filename);
- if (rh == NULL)
+ if (NULL == rh)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _
- ("Failed to resume sub-download `%s': could not open file `%s'\n"),
- ser, filename);
+ _("Failed to resume sub-download `%s': could not open file `%s'\n"),
+ ser,
+ filename);
GNUNET_free (ser);
return GNUNET_OK;
}
if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to resume sub-download `%s': %s\n"), ser, emsg);
+ _("Failed to resume sub-download `%s': %s\n"),
+ ser,
+ emsg);
GNUNET_free (emsg);
}
GNUNET_free (ser);
{
struct GNUNET_FS_DownloadContext *dcc;
- if (dc->meta != NULL)
+ if (NULL != dc->meta)
GNUNET_CONTAINER_meta_data_destroy (dc->meta);
- if (dc->uri != NULL)
+ if (NULL != dc->uri)
GNUNET_FS_uri_destroy (dc->uri);
GNUNET_free_non_null (dc->temp_filename);
GNUNET_free_non_null (dc->emsg);
GNUNET_free_non_null (dc->serialization);
while (NULL != (dcc = dc->child_head))
{
- GNUNET_CONTAINER_DLL_remove (dc->child_head, dc->child_tail, dcc);
+ GNUNET_CONTAINER_DLL_remove (dc->child_head,
+ dc->child_tail,
+ dcc);
free_download_context (dcc);
}
GNUNET_FS_free_download_request_ (dc->top_request);
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);
}
dc->options = (enum GNUNET_FS_DownloadOptions) options;
dc->active =
- GNUNET_CONTAINER_multihashmap_create (1 + 2 * (dc->length / DBLOCK_SIZE));
+ GNUNET_CONTAINER_multihashmap_create (1 + 2 * (dc->length / DBLOCK_SIZE), GNUNET_NO);
dc->has_finished = (int) status;
dc->treedepth =
GNUNET_FS_compute_depth (GNUNET_FS_uri_chk_get_file_size (dc->uri));
if (GNUNET_FS_uri_test_loc (dc->uri))
GNUNET_assert (GNUNET_OK ==
GNUNET_FS_uri_loc_get_peer_identity (dc->uri, &dc->target));
- if (dc->emsg == NULL)
+ if (NULL == dc->emsg)
{
dc->top_request = read_download_request (rh);
- if (dc->top_request == NULL)
+ if (NULL == dc->top_request)
{
GNUNET_break (0);
goto cleanup;
}
}
dn = get_download_sync_filename (dc, dc->serialization, ".dir");
- if (dn != NULL)
+ if (NULL != dn)
{
- if (GNUNET_YES == GNUNET_DISK_directory_test (dn))
+ if (GNUNET_YES == GNUNET_DISK_directory_test (dn, GNUNET_YES))
GNUNET_DISK_directory_scan (dn, &deserialize_subdownload, dc);
GNUNET_free (dn);
}
- if (parent != NULL)
+ if (NULL != parent)
{
- GNUNET_abort (); // for debugging for now - FIXME
GNUNET_CONTAINER_DLL_insert (parent->child_head, parent->child_tail, dc);
}
- if (search != NULL)
+ if (NULL != search)
{
dc->search = search;
search->download = dc;
}
- if ((parent == NULL) && (search == NULL))
+ if ((NULL == parent) && (NULL == search))
{
dc->top =
GNUNET_FS_make_top (dc->h, &GNUNET_FS_download_signal_suspend_, dc);
pi.status = GNUNET_FS_STATUS_SEARCH_RESUME;
pi.value.search.specifics.resume.message = sc->emsg;
pi.value.search.specifics.resume.is_paused =
- (sc->client == NULL) ? GNUNET_YES : GNUNET_NO;
- sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc);
+ (NULL == sc->client) ? GNUNET_YES : GNUNET_NO;
+ sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc->h, sc);
GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
&signal_result_resume, sc);
uint32_t options;
char in_pause;
- if ((psearch_result != NULL) && (psearch_result->update_search != NULL))
+ if ((NULL != psearch_result) && (NULL != psearch_result->update_search))
{
GNUNET_break (0);
return NULL;
}
uris = NULL;
emsg = NULL;
- sc = GNUNET_malloc (sizeof (struct GNUNET_FS_SearchContext));
- if (psearch_result != NULL)
+ sc = GNUNET_new (struct GNUNET_FS_SearchContext);
+ if (NULL != psearch_result)
{
sc->psearch_result = psearch_result;
psearch_result->update_search = sc;
}
sc->h = h;
sc->serialization = GNUNET_strdup (serialization);
- if ((GNUNET_OK != GNUNET_BIO_read_string (rh, "search-uri", &uris, 10 * 1024))
- || (NULL == (sc->uri = GNUNET_FS_uri_parse (uris, &emsg))) ||
+ if ((GNUNET_OK !=
+ GNUNET_BIO_read_string (rh, "search-uri", &uris, 10 * 1024)) ||
+ (NULL == (sc->uri = GNUNET_FS_uri_parse (uris, &emsg))) ||
((GNUNET_YES != GNUNET_FS_uri_test_ksk (sc->uri)) &&
(GNUNET_YES != GNUNET_FS_uri_test_sks (sc->uri))) ||
(GNUNET_OK != read_start_time (rh, &sc->start_time)) ||
goto cleanup;
}
sc->options = (enum GNUNET_FS_SearchOptions) options;
- sc->master_result_map = GNUNET_CONTAINER_multihashmap_create (16);
+ sc->master_result_map = GNUNET_CONTAINER_multihashmap_create (16, GNUNET_NO);
dn = get_serialization_file_name_in_dir (h,
- (sc->psearch_result ==
- NULL) ?
+ (NULL == sc->psearch_result) ?
GNUNET_FS_SYNC_PATH_MASTER_SEARCH :
GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
sc->serialization, "");
- if (dn != NULL)
+ if (NULL != dn)
{
- if (GNUNET_YES == GNUNET_DISK_directory_test (dn))
+ if (GNUNET_YES == GNUNET_DISK_directory_test (dn, GNUNET_YES))
GNUNET_DISK_directory_scan (dn, &deserialize_search_result, sc);
GNUNET_free (dn);
}
(GNUNET_OK != GNUNET_FS_search_start_searching_ (sc)))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _
- ("Could not resume running search, will resume as paused search\n"));
+ _("Could not resume running search, will resume as paused search\n"));
}
signal_search_resume (sc);
GNUNET_free (uris);
* Function called with a filename of serialized search operation
* to deserialize.
*
- * @param cls the 'struct GNUNET_FS_Handle*'
+ * @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)
+deserialize_search_file (void *cls,
+ const char *filename)
{
struct GNUNET_FS_Handle *h = cls;
char *ser;
return GNUNET_OK; /* skip directories */
ser = get_serialization_short_name (filename);
rh = GNUNET_BIO_read_open (filename);
- if (rh == NULL)
+ if (NULL == rh)
{
- if (ser != NULL)
+ if (NULL != ser)
{
GNUNET_FS_remove_sync_file_ (h, GNUNET_FS_SYNC_PATH_MASTER_SEARCH, ser);
GNUNET_free (ser);
return GNUNET_OK;
}
sc = deserialize_search (h, rh, NULL, ser);
- if (sc != NULL)
+ if (NULL != sc)
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))
* Function called with a filename of serialized download operation
* to deserialize.
*
- * @param cls the 'struct GNUNET_FS_Handle*'
+ * @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)
ser = get_serialization_short_name (filename);
rh = GNUNET_BIO_read_open (filename);
- if (rh == NULL)
+ if (NULL == rh)
{
if (0 != UNLINK (filename))
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", filename);
char *dn;
dn = get_serialization_file_name (h, master_path, "");
- if (dn == NULL)
+ if (NULL == dn)
return;
- if (GNUNET_YES == GNUNET_DISK_directory_test (dn))
+ if (GNUNET_YES == GNUNET_DISK_directory_test (dn, GNUNET_YES))
GNUNET_DISK_directory_scan (dn, proc, h);
GNUNET_free (dn);
}
* @param cfg configuration to use
* @param client_name unique identifier for this client
* @param upcb function to call to notify about FS actions
- * @param upcb_cls closure for upcb
+ * @param upcb_cls closure for @a upcb
* @param flags specific attributes for fs-operations
- * @param ... list of optional options, terminated with GNUNET_FS_OPTIONS_END
+ * @param ... list of optional options, terminated with #GNUNET_FS_OPTIONS_END
* @return NULL on error
*/
struct GNUNET_FS_Handle *
GNUNET_FS_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
- const char *client_name, GNUNET_FS_ProgressCallback upcb,
- void *upcb_cls, enum GNUNET_FS_Flags flags, ...)
+ const char *client_name,
+ GNUNET_FS_ProgressCallback upcb,
+ void *upcb_cls,
+ enum GNUNET_FS_Flags flags, ...)
{
struct GNUNET_FS_Handle *ret;
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;
ret->upcb_cls = upcb_cls;
ret->flags = flags;
- ret->max_parallel_downloads = 1;
- ret->max_parallel_requests = 1;
+ ret->max_parallel_downloads = DEFAULT_MAX_PARALLEL_DOWNLOADS;
+ ret->max_parallel_requests = DEFAULT_MAX_PARALLEL_REQUESTS;
ret->avg_block_latency = GNUNET_TIME_UNIT_MINUTES; /* conservative starting point */
va_start (ap, flags);
while (GNUNET_FS_OPTIONS_END != (opt = va_arg (ap, enum GNUNET_FS_OPTIONS)))
* The callback given to GNUNET_FS_start will no longer be
* called after this function returns.
*
- * @param h handle that was returned from GNUNET_FS_start
+ * @param h handle that was returned from #GNUNET_FS_start()
*/
void
GNUNET_FS_stop (struct GNUNET_FS_Handle *h)
{
while (h->top_head != NULL)
h->top_head->ssf (h->top_head->ssf_cls);
- if (h->queue_job != GNUNET_SCHEDULER_NO_TASK)
+ if (h->queue_job != NULL)
GNUNET_SCHEDULER_cancel (h->queue_job);
GNUNET_free (h->client_name);
GNUNET_free (h);
}
-/* end of fs.c */
+/* end of fs_api.c */
projects / oweals / gnunet.git / blobdiff