GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
if (sr->probe_cancel_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (sr->sc->h->sched,
- sr->probe_cancel_task);
+ GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
}
- sr->probe_cancel_task = GNUNET_SCHEDULER_add_delayed (sr->sc->h->sched,
- sr->remaining_probe_time,
+ sr->probe_cancel_task = GNUNET_SCHEDULER_add_delayed (sr->remaining_probe_time,
&probe_failure_handler,
sr);
break;
case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
if (sr->probe_cancel_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (sr->sc->h->sched,
- sr->probe_cancel_task);
+ GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
}
- sr->probe_cancel_task = GNUNET_SCHEDULER_add_delayed (sr->sc->h->sched,
- sr->remaining_probe_time,
+ sr->probe_cancel_task = GNUNET_SCHEDULER_add_delayed (sr->remaining_probe_time,
&probe_success_handler,
sr);
break;
case GNUNET_FS_STATUS_DOWNLOAD_STOPPED:
if (sr->probe_cancel_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (sr->sc->h->sched,
- sr->probe_cancel_task);
+ GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
}
sr = NULL;
case GNUNET_FS_STATUS_DOWNLOAD_ACTIVE:
GNUNET_assert (sr->probe_cancel_task == GNUNET_SCHEDULER_NO_TASK);
sr->probe_active_time = GNUNET_TIME_absolute_get ();
- sr->probe_cancel_task = GNUNET_SCHEDULER_add_delayed (sr->sc->h->sched,
- sr->remaining_probe_time,
+ sr->probe_cancel_task = GNUNET_SCHEDULER_add_delayed (sr->remaining_probe_time,
&probe_failure_handler,
sr);
break;
case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
if (sr->probe_cancel_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (sr->sc->h->sched,
- sr->probe_cancel_task);
+ GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
}
dur = GNUNET_TIME_absolute_get_duration (sr->probe_active_time);
const void *data,
size_t size)
{
- if (GNUNET_TIME_absolute_get_duration (expiration).value > 0)
+ if (GNUNET_TIME_absolute_get_duration (expiration).rel_value > 0)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Result received has already expired.\n");
}
switch (type)
{
- case GNUNET_BLOCK_TYPE_KBLOCK:
+ case GNUNET_BLOCK_TYPE_FS_KBLOCK:
if (! GNUNET_FS_uri_test_ksk (sc->uri))
{
GNUNET_break (0);
}
process_kblock (sc, data, size);
break;
- case GNUNET_BLOCK_TYPE_SBLOCK:
+ case GNUNET_BLOCK_TYPE_FS_SBLOCK:
if (! GNUNET_FS_uri_test_sks (sc->uri))
{
GNUNET_break (0);
}
process_sblock (sc, data, size);
break;
- case GNUNET_BLOCK_TYPE_NBLOCK:
+ case GNUNET_BLOCK_TYPE_FS_NBLOCK:
if (! GNUNET_FS_uri_test_ksk (sc->uri))
{
GNUNET_break (0);
process_nblock (sc, data, size);
break;
case GNUNET_BLOCK_TYPE_ANY:
- case GNUNET_BLOCK_TYPE_DBLOCK:
- case GNUNET_BLOCK_TYPE_ONDEMAND:
- case GNUNET_BLOCK_TYPE_IBLOCK:
+ case GNUNET_BLOCK_TYPE_FS_DBLOCK:
+ case GNUNET_BLOCK_TYPE_FS_ONDEMAND:
+ case GNUNET_BLOCK_TYPE_FS_IBLOCK:
GNUNET_break (0);
break;
default:
sm->options = htonl (1);
else
sm->options = htonl (0);
- sm->type = htonl (GNUNET_BLOCK_TYPE_SBLOCK);
+ sm->type = htonl (GNUNET_BLOCK_TYPE_FS_SBLOCK);
sm->anonymity_level = htonl (sc->anonymity);
sm->target = sc->uri->data.sks.namespace;
identifier = sc->uri->data.sks.identifier;
size_t size;
sc->task = GNUNET_SCHEDULER_NO_TASK;
- client = GNUNET_CLIENT_connect (sc->h->sched,
- "fs",
+ client = GNUNET_CLIENT_connect ("fs",
sc->h->cfg);
if (NULL == client)
{
sc->client = NULL;
}
sc->task
- = GNUNET_SCHEDULER_add_delayed (sc->h->sched,
- GNUNET_TIME_UNIT_SECONDS,
+ = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
&do_reconnect,
sc);
}
&sc->requests[i].key);
}
}
- sc->client = GNUNET_CLIENT_connect (sc->h->sched,
- "fs",
+ sc->client = GNUNET_CLIENT_connect ("fs",
sc->h->cfg);
if (NULL == sc->client)
return GNUNET_SYSERR;
const GNUNET_HashCode * key,
void *value)
{
- struct GNUNET_FS_SearchContext *sc = cls;
- struct GNUNET_FS_Handle *h = sc->h;
struct GNUNET_FS_SearchResult *sr = value;
if (sr->probe_ctx != NULL)
}
if (sr->probe_cancel_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (h->sched,
- sr->probe_cancel_task);
+ GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
}
if (sr->update_search != NULL)
void *value)
{
struct GNUNET_FS_SearchContext *sc = cls;
- struct GNUNET_FS_Handle *h = sc->h;
struct GNUNET_FS_SearchResult *sr = value;
struct GNUNET_FS_ProgressInfo pi;
if (sr->probe_ctx != NULL)
GNUNET_FS_download_stop (sr->probe_ctx, GNUNET_YES);
if (sr->probe_cancel_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (h->sched,
- sr->probe_cancel_task);
+ GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
GNUNET_free (sr);
return GNUNET_OK;
}
sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc);
GNUNET_break (NULL == sc->client_info);
if (sc->task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (sc->h->sched,
- sc->task);
+ GNUNET_SCHEDULER_cancel (sc->task);
if (NULL != sc->client)
GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
GNUNET_CONTAINER_multihashmap_destroy (sc->master_result_map);
struct GNUNET_FS_ProgressInfo pi;
if (sc->task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (sc->h->sched,
- sc->task);
+ GNUNET_SCHEDULER_cancel (sc->task);
sc->task = GNUNET_SCHEDULER_NO_TASK;
if (NULL != sc->client)
GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
void *value)
{
struct GNUNET_FS_SearchContext *sc = cls;
- struct GNUNET_FS_Handle *h = sc->h;
struct GNUNET_FS_SearchResult *sr = value;
struct GNUNET_FS_ProgressInfo pi;
if (NULL != sr->download)
{
sr->download->search = NULL;
+ sr->download->top = GNUNET_FS_make_top (sr->download->h,
+ &GNUNET_FS_download_signal_suspend_,
+ sr->download);
if (NULL != sr->download->serialization)
{
GNUNET_FS_remove_sync_file_ (sc->h,
if (sr->probe_ctx != NULL)
GNUNET_FS_download_stop (sr->probe_ctx, GNUNET_YES);
if (sr->probe_cancel_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (h->sched,
- sr->probe_cancel_task);
+ GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
GNUNET_free (sr);
return GNUNET_OK;
}
sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc);
GNUNET_break (NULL == sc->client_info);
if (sc->task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (sc->h->sched,
- sc->task);
+ GNUNET_SCHEDULER_cancel (sc->task);
if (NULL != sc->client)
GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
GNUNET_CONTAINER_multihashmap_destroy (sc->master_result_map);