#include "gnunet_arm_service.h"
#include "gnunet_fs_service.h"
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
#define START_ARM GNUNET_YES
/**
* 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?
abort_search_task (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_FS_search_stop (search);
+ if (search != NULL)
+ GNUNET_FS_search_stop (search);
search = NULL;
}
start = GNUNET_TIME_absolute_get ();
search = GNUNET_FS_search_start (fs,
kuri,
- 1);
+ 1,
+ GNUNET_FS_SEARCH_OPTION_NONE,
+ "search");
GNUNET_FS_uri_destroy (kuri);
GNUNET_assert (search != NULL);
break;
case GNUNET_FS_STATUS_SEARCH_RESULT:
+#if VERBOSE
printf ("Search complete.\n");
+#endif
GNUNET_SCHEDULER_add_continuation (sched,
- GNUNET_NO,
&abort_search_task,
NULL,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
event->value.publish.specifics.error.message);
GNUNET_break (0);
GNUNET_SCHEDULER_add_continuation (sched,
- GNUNET_NO,
&abort_publish_task,
NULL,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
"Error searching file: %s\n",
event->value.search.specifics.error.message);
GNUNET_SCHEDULER_add_continuation (sched,
- GNUNET_NO,
&abort_search_task,
NULL,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
case GNUNET_FS_STATUS_SEARCH_START:
GNUNET_assert (search == NULL);
- // GNUNET_assert (0 == strcmp ("search", event->value.search.cctx));
+ GNUNET_assert (0 == strcmp ("search", event->value.search.cctx));
GNUNET_assert (1 == event->value.search.anonymity);
break;
+ case GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED:
+ break;
case GNUNET_FS_STATUS_SEARCH_STOPPED:
GNUNET_assert (search == event->value.search.sc);
GNUNET_SCHEDULER_add_continuation (sched,
- GNUNET_NO,
&abort_publish_task,
NULL,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
default:
- printf ("Unexpected event: %d\n",
- event->status);
+ fprintf (stderr,
+ "Unexpected event: %d\n",
+ event->status);
break;
}
return NULL;
{
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);
}
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);
- fi = GNUNET_FS_file_information_create_from_data ("publish-context",
+ fi = GNUNET_FS_file_information_create_from_data (fs,
+ "publish-context",
FILESIZE,
buf,
kuri,
argvx, "test-fs-search",
"nohelp", options, &run, NULL);
stop_arm (&p1);
+ GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-search/");
return 0;
}