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
/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
/**
* How long should our test-content live?
struct PeerContext
{
struct GNUNET_CONFIGURATION_Handle *cfg;
- struct GNUNET_PeerIdentity id;
#if START_ARM
pid_t arm_pid;
#endif
static struct GNUNET_FS_PublishContext *publish;
-static struct GNUNET_FS_PublishContext *publish;
-
static char *fn1;
static char *fn2;
+static int err;
static void
abort_publish_task (void *cls,
progress_cb (void *cls,
const struct GNUNET_FS_ProgressInfo *event)
{
+ void *ret;
+ ret = NULL;
switch (event->status)
{
case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
+ ret = event->value.publish.cctx;
printf ("Publish complete, %llu kbps.\n",
(unsigned long long) (FILESIZE * 1000 / (1+GNUNET_TIME_absolute_get_duration (start).value) / 1024));
- GNUNET_SCHEDULER_add_continuation (sched,
- GNUNET_NO,
- &abort_publish_task,
- NULL,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ if (0 == strcmp ("publish-context-dir",
+ event->value.publish.cctx))
+ GNUNET_SCHEDULER_add_continuation (sched,
+ &abort_publish_task,
+ NULL,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
- GNUNET_assert (publish == event->value.publish.sc);
+ ret = event->value.publish.cctx;
+ GNUNET_assert (publish == event->value.publish.pc);
#if VERBOSE
printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n",
(unsigned long long) event->value.publish.completed,
#endif
break;
case GNUNET_FS_STATUS_PUBLISH_ERROR:
+ ret = event->value.publish.cctx;
fprintf (stderr,
"Error publishing file: %s\n",
event->value.publish.specifics.error.message);
- GNUNET_SCHEDULER_add_continuation (sched,
- GNUNET_NO,
- &abort_publish_task,
- NULL,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ err = 1;
+ if (0 == strcmp ("publish-context-dir",
+ event->value.publish.cctx))
+ {
+ fprintf (stderr, "Scheduling abort task for error on `%s'\n",
+ (const char*) event->value.publish.cctx);
+ GNUNET_SCHEDULER_add_continuation (sched,
+ &abort_publish_task,
+ NULL,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ }
break;
case GNUNET_FS_STATUS_PUBLISH_START:
- GNUNET_assert (0 == strcmp ("publish-context", event->value.publish.cctx));
- GNUNET_assert (NULL == event->value.publish.pctx);
- GNUNET_assert (FILESIZE == event->value.publish.size);
- GNUNET_assert (0 == event->value.publish.completed);
- GNUNET_assert (1 == event->value.publish.anonymity);
+ ret = event->value.publish.cctx;
+ if (0 == strcmp ("publish-context1",
+ event->value.publish.cctx))
+ {
+ GNUNET_assert (0 == strcmp ("publish-context-dir",
+ event->value.publish.pctx));
+ GNUNET_assert (FILESIZE == event->value.publish.size);
+ GNUNET_assert (0 == event->value.publish.completed);
+ GNUNET_assert (1 == event->value.publish.anonymity);
+ }
+ else if (0 == strcmp ("publish-context2",
+ event->value.publish.cctx))
+ {
+ GNUNET_assert (0 == strcmp ("publish-context-dir",
+ event->value.publish.pctx));
+ GNUNET_assert (FILESIZE == event->value.publish.size);
+ GNUNET_assert (0 == event->value.publish.completed);
+ GNUNET_assert (2 == event->value.publish.anonymity);
+ }
+ else if (0 == strcmp ("publish-context-dir",
+ event->value.publish.cctx))
+ {
+ GNUNET_assert (0 == event->value.publish.completed);
+ GNUNET_assert (3 == event->value.publish.anonymity);
+ }
+ else
+ GNUNET_assert (0);
break;
case GNUNET_FS_STATUS_PUBLISH_STOPPED:
- GNUNET_assert (publish == event->value.publish.sc);
- GNUNET_SCHEDULER_add_continuation (sched,
- GNUNET_NO,
- &abort_publish_task,
- NULL,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ if (0 == strcmp ("publish-context-dir",
+ event->value.publish.cctx))
+ GNUNET_assert (publish == event->value.publish.pc);
break;
default:
printf ("Unexpected event: %d\n",
event->status);
break;
}
- return NULL;
+ return ret;
}
{
p->cfg = GNUNET_CONFIGURATION_create ();
#if START_ARM
- p->arm_pid = GNUNET_OS_start_process ("gnunet-service-arm",
+ p->arm_pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
"gnunet-service-arm",
#if VERBOSE
"-L", "DEBUG",
#endif
"-c", cfgname, NULL);
- sleep (1); /* allow ARM to start */
#endif
GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
- GNUNET_ARM_start_services (p->cfg, sched, "core", NULL);
}
meta = GNUNET_CONTAINER_meta_data_create ();
kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
- fi1 = GNUNET_FS_file_information_create_from_file ("publish-context1",
+ fi1 = GNUNET_FS_file_information_create_from_file (fs,
+ "publish-context1",
fn1,
kuri,
meta,
1,
42,
GNUNET_TIME_relative_to_absolute (LIFETIME));
- fi2 = GNUNET_FS_file_information_create_from_file ("publish-context2",
+ fi2 = GNUNET_FS_file_information_create_from_file (fs,
+ "publish-context2",
fn2,
kuri,
meta,
GNUNET_YES,
- 1,
+ 2,
42,
GNUNET_TIME_relative_to_absolute (LIFETIME));
- fidir = GNUNET_FS_file_information_create_empty_directory ("publish-context-dir",
+ fidir = GNUNET_FS_file_information_create_empty_directory (fs,
+ "publish-context-dir",
kuri,
meta,
- 1,
+ 3,
42,
GNUNET_TIME_relative_to_absolute (LIFETIME));
GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi1));
"nohelp", options, &run, NULL);
stop_arm (&p1);
GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-publish/");
- GNUNET_DISK_directory_remove (fn1);
- GNUNET_free_non_null (fn1);
- GNUNET_DISK_directory_remove (fn2);
- GNUNET_free_non_null (fn2);
- return 0;
+ if (fn1 != NULL)
+ {
+ GNUNET_DISK_directory_remove (fn1);
+ GNUNET_free (fn1);
+ }
+ if (fn2 != NULL)
+ {
+ GNUNET_DISK_directory_remove (fn2);
+ GNUNET_free (fn2);
+ }
+ return err;
}
/* end of test_fs_publish.c */
projects / oweals / gnunet.git / blobdiff