static void
abort_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ timeout_task = GNUNET_SCHEDULER_NO_TASK;
fprintf (stderr,
"Timeout\n");
- if (NULL != publish)
- {
- GNUNET_FS_publish_stop (publish);
- publish = NULL;
- }
if (NULL != search)
{
GNUNET_FS_search_stop (search);
search = NULL;
}
+ if (NULL != publish)
+ {
+ GNUNET_FS_publish_stop (publish);
+ publish = NULL;
+ }
err = 1;
}
static void
abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_FS_publish_stop (publish);
- publish = NULL;
+ if (NULL != publish)
+ {
+ GNUNET_FS_publish_stop (publish);
+ publish = NULL;
+ }
+ if (GNUNET_SCHEDULER_NO_TASK != timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (timeout_task);
+ timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ }
}
static void
abort_search_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (search != NULL)
+ if (NULL != search)
+ {
GNUNET_FS_search_stop (search);
- search = NULL;
+ search = NULL;
+ }
}