/*
This file is part of GNUnet.
- (C) 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2012 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.
*/
/**
* @file namecache/test_namecache_api.c
static struct GNUNET_NAMECACHE_Handle *nsh;
-static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
+static struct GNUNET_SCHEDULER_Task * endbadly_task;
static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
* Re-establish the connection to the service.
*
* @param cls handle to use to re-connect.
- * @param tc scheduler context
*/
static void
-endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+endbadly (void *cls)
{
if (NULL != nsqe)
{
static void
-end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end (void *cls)
{
cleanup ();
res = 0;
static void
rd_decrypt_cb (void *cls,
unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+ const struct GNUNET_GNSRECORD_Data *rd)
{
char rd_cmp_data[TEST_RECORD_DATALEN];
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Block was decrypted successfully \n");
-
- GNUNET_SCHEDULER_add_now (&end, NULL);
+
+ GNUNET_SCHEDULER_add_now (&end, NULL);
}
+
static void
name_lookup_proc (void *cls,
- const struct GNUNET_NAMESTORE_Block *block)
+ const struct GNUNET_GNSRECORD_Block *block)
{
const char *name = cls;
nsqe = NULL;
GNUNET_assert (NULL != cls);
- if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
+ if (endbadly_task != NULL)
{
GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task = GNUNET_SCHEDULER_NO_TASK;
+ endbadly_task = NULL;
}
if (NULL == block)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Namecache returned no block\n"));
- if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
+ if (NULL != endbadly_task)
GNUNET_SCHEDULER_cancel (endbadly_task);
endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
return;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Namecache returned block, decrypting \n");
- GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_block_decrypt(block,
+ GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_block_decrypt(block,
&pubkey, name, &rd_decrypt_cb, (void *) name));
}
(success == GNUNET_OK) ? "SUCCESS" : "FAIL");
/* Create derived hash */
- GNUNET_NAMESTORE_query_from_public_key (&pubkey, name, &derived_hash);
+ GNUNET_GNSRECORD_query_from_public_key (&pubkey, name, &derived_hash);
nsqe = GNUNET_NAMECACHE_lookup_block (nsh, &derived_hash,
&name_lookup_proc, (void *) name);
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TESTING_Peer *peer)
{
- struct GNUNET_NAMESTORE_RecordData rd;
- struct GNUNET_NAMESTORE_Block *block;
+ struct GNUNET_GNSRECORD_Data rd;
+ struct GNUNET_GNSRECORD_Block *block;
char *hostkey_file;
const char * name = "dummy.dummy.gnunet";
GNUNET_CRYPTO_ecdsa_key_get_public (privkey, &pubkey);
- rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
+ rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us + 10000000000;
rd.record_type = TEST_RECORD_TYPE;
rd.data_size = TEST_RECORD_DATALEN;
rd.data = GNUNET_malloc (TEST_RECORD_DATALEN);
+ rd.flags = 0;
memset ((char *) rd.data, 'a', TEST_RECORD_DATALEN);
- block = GNUNET_NAMESTORE_block_create (privkey,
- GNUNET_TIME_UNIT_FOREVER_ABS, name, &rd, 1 );
+ block = GNUNET_GNSRECORD_block_create (privkey,
+ GNUNET_TIME_UNIT_FOREVER_ABS,
+ name, &rd, 1);
if (NULL == block)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Namecache cannot cache no block\n"));
+ "Namecache cannot cache no block!\n");
+ GNUNET_SCHEDULER_shutdown ();
+ GNUNET_free (block);
+ return;
}
nsh = GNUNET_NAMECACHE_connect (cfg);
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Namecache cannot connect to namecache\n"));
+ GNUNET_SCHEDULER_shutdown ();
+ GNUNET_free (block);
+ return;
}
GNUNET_break (NULL != nsh);
- nsqe = GNUNET_NAMECACHE_block_cache (nsh, block , &cache_cont, (void *) name);
+ nsqe = GNUNET_NAMECACHE_block_cache (nsh,
+ block,
+ &cache_cont, (void *) name);
if (NULL == nsqe)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Namecache cannot cache no block\n"));
}
-
+ GNUNET_free (block);
GNUNET_free ((void *)rd.data);
}