/*
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
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.
*/
/**
#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;
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 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);
}
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;
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_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;
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)
{