timeout_kill_task (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Timeout downloading file\n");
if (download != NULL)
{
GNUNET_FS_download_stop (download, GNUNET_YES);
restart_fs_task (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Restarting FS.\n");
GNUNET_FS_stop (fs);
fs = GNUNET_FS_start (cfg,
"test-fs-download-persistence",
case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
#if VERBOSE
printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
- (unsigned long long) event->abs_value.publish.completed,
- (unsigned long long) event->abs_value.publish.size,
- event->abs_value.publish.specifics.progress.depth,
- (unsigned long long) event->abs_value.publish.specifics.progress.offset);
+ (unsigned long long) event->value.publish.completed,
+ (unsigned long long) event->value.publish.size,
+ event->value.publish.specifics.progress.depth,
+ (unsigned long long) event->value.publish.specifics.progress.offset);
#endif
break;
case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
GNUNET_assert (download == event->value.download.dc);
#if VERBOSE
printf ("Download is progressing (%llu/%llu at level %u off %llu)...\n",
- (unsigned long long) event->abs_value.download.completed,
- (unsigned long long) event->abs_value.download.size,
- event->abs_value.download.specifics.progress.depth,
- (unsigned long long) event->abs_value.download.specifics.progress.offset);
+ (unsigned long long) event->value.download.completed,
+ (unsigned long long) event->value.download.size,
+ event->value.download.specifics.progress.depth,
+ (unsigned long long) event->value.download.specifics.progress.offset);
#endif
break;
case GNUNET_FS_STATUS_PUBLISH_ERROR:
publish = event->value.publish.pc;
break;
case GNUNET_FS_STATUS_DOWNLOAD_SUSPEND:
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Download suspended.\n");
GNUNET_assert (event->value.download.dc == download);
download = NULL;
break;
case GNUNET_FS_STATUS_DOWNLOAD_RESUME:
GNUNET_assert (NULL == download);
download = event->value.download.dc;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Download resumed.\n");
break;
case GNUNET_FS_STATUS_DOWNLOAD_ACTIVE:
consider_restart (event->status);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Download active.\n");
break;
case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
consider_restart (event->status);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Download inactive.\n");
break;
case GNUNET_FS_STATUS_PUBLISH_START:
GNUNET_assert (0 == strcmp ("publish-context", event->value.publish.cctx));
fs = NULL;
break;
case GNUNET_FS_STATUS_DOWNLOAD_START:
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Download started.\n");
consider_restart (event->status);
GNUNET_assert (download == NULL);
download = event->value.download.dc;
stop_arm (struct PeerContext *p)
{
#if START_ARM
- if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
- if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
- GNUNET_OS_process_close (p->arm_proc);
- p->arm_proc = NULL;
+ if (NULL != p->arm_proc)
+ {
+ if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+ if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
+ GNUNET_OS_process_close (p->arm_proc);
+ p->arm_proc = NULL;
+ }
#endif
GNUNET_CONFIGURATION_destroy (p->cfg);
}
struct GNUNET_FS_Uri *kuri;
struct GNUNET_FS_FileInformation *fi;
size_t i;
+ struct GNUNET_FS_BlockOptions bo;
cfg = c;
setup_peer (&p1, "test_fs_download_data.conf");
buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256);
meta = GNUNET_CONTAINER_meta_data_create ();
kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
+ bo.content_priority = 42;
+ bo.anonymity_level = 1;
+ bo.replication_level = 0;
+ bo.expiration_time = GNUNET_TIME_relative_to_absolute (LIFETIME);
fi = GNUNET_FS_file_information_create_from_data (fs,
"publish-context",
FILESIZE,
kuri,
meta,
GNUNET_NO,
- 1,
- 42,
- GNUNET_TIME_relative_to_absolute (LIFETIME));
+ &bo);
GNUNET_FS_uri_destroy (kuri);
GNUNET_CONTAINER_meta_data_destroy (meta);
GNUNET_assert (NULL != fi);