/*
This file is part of GNUnet.
- (C) 2005, 2006, 2008, 2009 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2005-2013 GNUnet e.V.
- 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 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_arm_service.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_fs_service.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
-#define START_ARM GNUNET_YES
-
-static struct PeerContext p1;
-
-static GNUNET_HashCode nsid;
+static struct GNUNET_CRYPTO_EcdsaPublicKey nsid;
static struct GNUNET_FS_Uri *sks_expect_uri;
static struct GNUNET_FS_SearchContext *ksk_search;
-static GNUNET_SCHEDULER_TaskIdentifier kill_task;
+static struct GNUNET_SCHEDULER_Task * kill_task;
static int update_started;
static int err;
-struct PeerContext
-{
- struct GNUNET_CONFIGURATION_Handle *cfg;
-#if START_ARM
- struct GNUNET_OS_Process *arm_proc;
-#endif
-};
-
-
-static void
-setup_peer (struct PeerContext *p, const char *cfgname)
-{
- p->cfg = GNUNET_CONFIGURATION_create ();
-#if START_ARM
- p->arm_proc =
- GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
- "gnunet-service-arm",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
- "-c", cfgname, NULL);
-#endif
- GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
-}
-
-
-static void
-stop_arm (struct PeerContext *p)
-{
-#if START_ARM
- 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);
-}
-
static void
-abort_ksk_search_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+abort_ksk_search_task (void *cls)
{
if (ksk_search != NULL)
{
if (sks_search == NULL)
{
GNUNET_FS_stop (fs);
- if (GNUNET_SCHEDULER_NO_TASK != kill_task)
+ if (NULL != kill_task)
GNUNET_SCHEDULER_cancel (kill_task);
}
}
static void
-abort_sks_search_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+abort_sks_search_task (void *cls)
{
- struct GNUNET_FS_Namespace *ns;
-
if (sks_search == NULL)
return;
GNUNET_FS_search_stop (sks_search);
sks_search = NULL;
- ns = GNUNET_FS_namespace_create (fs, "testNamespace");
- GNUNET_assert (NULL != ns);
- GNUNET_assert (GNUNET_OK == GNUNET_FS_namespace_delete (ns, GNUNET_YES));
if (ksk_search == NULL)
{
GNUNET_FS_stop (fs);
- if (GNUNET_SCHEDULER_NO_TASK != kill_task)
+ if (NULL != kill_task)
GNUNET_SCHEDULER_cancel (kill_task);
}
}
static void
-do_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_timeout (void *cls)
{
+ err = 1;
FPRINTF (stderr, "%s", "Operation timed out\n");
- kill_task = GNUNET_SCHEDULER_NO_TASK;
- abort_sks_search_task (NULL, tc);
- abort_ksk_search_task (NULL, tc);
+ kill_task = NULL;
+ abort_sks_search_task (NULL);
+ abort_ksk_search_task (NULL);
}
-
static void *
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
{
FPRINTF (stderr, "%s", "Wrong result for ksk search!\n");
err = 1;
}
- GNUNET_SCHEDULER_add_continuation (&abort_ksk_search_task, NULL,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ GNUNET_SCHEDULER_add_now (&abort_ksk_search_task, NULL);
}
else
{
FPRINTF (stderr, "Error searching file: %s\n",
event->value.search.specifics.error.message);
if (sks_search == event->value.search.sc)
- GNUNET_SCHEDULER_add_continuation (&abort_sks_search_task, NULL,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ GNUNET_SCHEDULER_add_now (&abort_sks_search_task, NULL);
else if (ksk_search == event->value.search.sc)
- GNUNET_SCHEDULER_add_continuation (&abort_ksk_search_task, NULL,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ GNUNET_SCHEDULER_add_now (&abort_ksk_search_task, NULL);
else
GNUNET_break (0);
break;
char *msg;
struct GNUNET_FS_Uri *sks_uri;
char sbuf[1024];
- struct GNUNET_CRYPTO_HashAsciiEncoded enc;
+ char buf[1024];
+ char *ret;
if (NULL != emsg)
{
GNUNET_FS_stop (fs);
return;
}
- GNUNET_CRYPTO_hash_to_enc (&nsid, &enc);
- GNUNET_snprintf (sbuf, sizeof (sbuf), "gnunet://fs/sks/%s/this", &enc);
+ ret = GNUNET_STRINGS_data_to_string (&nsid, sizeof (nsid), buf, sizeof (buf));
+ GNUNET_assert (NULL != ret);
+ ret[0] = '\0';
+ GNUNET_snprintf (sbuf, sizeof (sbuf), "gnunet://fs/sks/%s/this", buf);
sks_uri = GNUNET_FS_uri_parse (sbuf, &msg);
if (NULL == sks_uri)
{
char *msg;
struct GNUNET_FS_BlockOptions bo;
+ if (NULL == uri)
+ {
+ fprintf (stderr, "Error publishing: %s\n", emsg);
+ err = 1;
+ GNUNET_FS_stop (fs);
+ return;
+ }
meta = GNUNET_CONTAINER_meta_data_create ();
msg = NULL;
ksk_uri = GNUNET_FS_uri_parse ("gnunet://fs/ksk/ns-search", &msg);
adv_cont (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
{
struct GNUNET_CONTAINER_MetaData *meta;
- struct GNUNET_FS_Namespace *ns;
+ struct GNUNET_CRYPTO_EcdsaPrivateKey *ns;
struct GNUNET_FS_BlockOptions bo;
if (NULL != emsg)
GNUNET_FS_stop (fs);
return;
}
- ns = GNUNET_FS_namespace_create (fs, "testNamespace");
- GNUNET_assert (NULL != ns);
+ ns = GNUNET_CRYPTO_ecdsa_key_create ();
meta = GNUNET_CONTAINER_meta_data_create ();
- GNUNET_assert (NULL == emsg);
sks_expect_uri = GNUNET_FS_uri_dup (uri);
bo.content_priority = 1;
bo.anonymity_level = 1;
bo.replication_level = 0;
bo.expiration_time =
GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_MINUTES);
- GNUNET_FS_publish_sks (fs, ns, "this", "next", meta, uri, /* FIXME: this is non-sense (use CHK URI!?) */
+ GNUNET_CRYPTO_ecdsa_key_get_public (ns, &nsid);
+ GNUNET_FS_publish_sks (fs, ns, "this", "next", meta, uri,
&bo, GNUNET_FS_PUBLISH_OPTION_NONE, &sks_cont, NULL);
GNUNET_CONTAINER_meta_data_destroy (meta);
- GNUNET_FS_namespace_delete (ns, GNUNET_NO);
-}
-
-
-static void
-ns_iterator (void *cls, const char *name, const GNUNET_HashCode * id)
-{
- int *ok = cls;
-
- if (0 != strcmp (name, "testNamespace"))
- return;
- *ok = GNUNET_YES;
- nsid = *id;
+ GNUNET_free (ns);
}
static void
testNamespace ()
{
- struct GNUNET_FS_Namespace *ns;
+ struct GNUNET_CRYPTO_EcdsaPrivateKey *ns;
struct GNUNET_FS_BlockOptions bo;
struct GNUNET_CONTAINER_MetaData *meta;
struct GNUNET_FS_Uri *ksk_uri;
- int ok;
+ struct GNUNET_FS_Uri *sks_uri;
- ns = GNUNET_FS_namespace_create (fs, "testNamespace");
- GNUNET_assert (NULL != ns);
- ok = GNUNET_NO;
- GNUNET_FS_namespace_list (fs, &ns_iterator, &ok);
- if (GNUNET_NO == ok)
- {
- FPRINTF (stderr, "%s", "namespace_list failed to find namespace!\n");
- GNUNET_FS_namespace_delete (ns, GNUNET_YES);
- GNUNET_FS_stop (fs);
- err = 1;
- return;
- }
+ ns = GNUNET_CRYPTO_ecdsa_key_create ();
meta = GNUNET_CONTAINER_meta_data_create ();
ksk_uri = GNUNET_FS_uri_parse ("gnunet://fs/ksk/testnsa", NULL);
bo.content_priority = 1;
bo.replication_level = 0;
bo.expiration_time =
GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_MINUTES);
- GNUNET_FS_namespace_advertise (fs, ksk_uri, ns, meta, &bo, "root", &adv_cont,
- NULL);
+ sks_uri = GNUNET_FS_uri_sks_create (&nsid, "root");
+ GNUNET_FS_publish_ksk (fs,
+ ksk_uri, meta, sks_uri,
+ &bo, GNUNET_FS_PUBLISH_OPTION_NONE,
+ &adv_cont, NULL);
+ GNUNET_FS_uri_destroy (sks_uri);
kill_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, &do_timeout,
NULL);
GNUNET_FS_uri_destroy (ksk_uri);
- GNUNET_FS_namespace_delete (ns, GNUNET_NO);
GNUNET_CONTAINER_meta_data_destroy (meta);
+ GNUNET_free (ns);
}
static void
-run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Peer *peer)
{
- setup_peer (&p1, "test_fs_namespace_data.conf");
fs = GNUNET_FS_start (cfg, "test-fs-namespace", &progress_cb, NULL,
GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
testNamespace ();
int
main (int argc, char *argv[])
{
- char *const argvx[] = {
- "test-fs-namespace",
- "-c",
- "test_fs_namespace_data.conf",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
- NULL
- };
- struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
-
- GNUNET_log_setup ("test_fs_namespace",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
- NULL);
- GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx,
- "test-fs-namespace", "nohelp", options, &run, NULL);
- stop_arm (&p1);
- if (GNUNET_YES != update_started)
- {
- FPRINTF (stderr, "%s", "Update search never started!\n");
- err = 1;
- }
- GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-namespace/");
+ if (0 != GNUNET_TESTING_peer_run ("test-fs-namespace",
+ "test_fs_namespace_data.conf",
+ &run, NULL))
+ return 1;
return err;
}
projects / oweals / gnunet.git / blobdiff