X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Ftest_fs_namespace.c;h=628cc0f1d82a801a378396c7fbe287d638a24989;hb=89c5d0047e261ed7e5fabb2e771123f1707e4670;hp=ddeab6dc93822e7b3355d2b3c7031fb5522bac99;hpb=ce52e258a28a17f5c319549fda1b5fbb8f6169a7;p=oweals%2Fgnunet.git diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c index ddeab6dc9..628cc0f1d 100644 --- a/src/fs/test_fs_namespace.c +++ b/src/fs/test_fs_namespace.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2005, 2006, 2008, 2009 Christian Grothoff (and other contributing authors) + Copyright (C) 2005-2013 Christian Grothoff (and other contributing authors) GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -14,8 +14,8 @@ 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. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /** @@ -29,7 +29,7 @@ #include "gnunet_fs_service.h" -static struct GNUNET_FS_PseudonymIdentifier nsid; +static struct GNUNET_CRYPTO_EcdsaPublicKey nsid; static struct GNUNET_FS_Uri *sks_expect_uri; @@ -41,7 +41,7 @@ static struct GNUNET_FS_SearchContext *sks_search; static struct GNUNET_FS_SearchContext *ksk_search; -static GNUNET_SCHEDULER_TaskIdentifier kill_task; +static struct GNUNET_SCHEDULER_Task * kill_task; static int update_started; @@ -58,7 +58,7 @@ abort_ksk_search_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) if (sks_search == NULL) { GNUNET_FS_stop (fs); - if (GNUNET_SCHEDULER_NO_TASK != kill_task) + if (NULL != kill_task) GNUNET_SCHEDULER_cancel (kill_task); } } @@ -68,19 +68,14 @@ abort_ksk_search_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void abort_sks_search_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - 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); } } @@ -89,8 +84,9 @@ abort_sks_search_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void do_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { + err = 1; FPRINTF (stderr, "%s", "Operation timed out\n"); - kill_task = GNUNET_SCHEDULER_NO_TASK; + kill_task = NULL; abort_sks_search_task (NULL, tc); abort_ksk_search_task (NULL, tc); } @@ -241,7 +237,7 @@ static void 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) @@ -251,57 +247,32 @@ adv_cont (void *cls, const struct GNUNET_FS_Uri *uri, const char *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_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 struct GNUNET_FS_PseudonymIdentifier *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; struct GNUNET_FS_Uri *sks_uri; - int ok; - 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; @@ -309,22 +280,23 @@ testNamespace () bo.replication_level = 0; bo.expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_MINUTES); - sks_uri = GNUNET_FS_uri_sks_create (ns, "root", NULL); - GNUNET_FS_publish_ksk (fs, - ksk_uri, meta, sks_uri, &bo, GNUNET_FS_PUBLISH_OPTION_NONE, + 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, +run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg, struct GNUNET_TESTING_Peer *peer) {