/*
This file is part of GNUnet.
- (C) 2012 Christian Grothoff (and other contributing authors)
+ (C) 2012, 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
/**
* @file namestore/test_namestore_api_store_update.c
* @brief testcase for namestore_api.c: store a record, update it and perform a lookup
+ * @author Matthias Wachs
*/
#include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_namecache_service.h"
#include "gnunet_namestore_service.h"
#include "gnunet_testing_lib.h"
static struct GNUNET_NAMESTORE_Handle *nsh;
+static struct GNUNET_NAMECACHE_Handle *nch;
+
static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
-static struct GNUNET_CRYPTO_EccPrivateKey *privkey;
+static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
-static struct GNUNET_CRYPTO_EccPublicKey pubkey;
+static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
static int res;
static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
-static const char * name = "dummy.dummy.gnunet";
+static struct GNUNET_NAMECACHE_QueueEntry *ncqe;
+
+static const char *name = "dummy";
+
+static char *directory;
static void
cleanup ()
GNUNET_NAMESTORE_disconnect (nsh);
nsh = NULL;
}
+ if (NULL != nch)
+ {
+ GNUNET_NAMECACHE_disconnect (nch);
+ nch = NULL;
+ }
if (NULL != privkey)
{
GNUNET_free (privkey);
* @param tc scheduler context
*/
static void
-endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+endbadly (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
if (NULL != nsqe)
{
GNUNET_NAMESTORE_cancel (nsqe);
nsqe = NULL;
}
+ if (NULL != ncqe)
+ {
+ GNUNET_NAMECACHE_cancel (ncqe);
+ ncqe = NULL;
+ }
cleanup ();
res = 1;
}
static void
-end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
cleanup ();
res = 0;
}
+
static void
put_cont (void *cls, int32_t success, const char *emsg);
static void
rd_decrypt_cb (void *cls,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+ unsigned int rd_count,
+ const struct GNUNET_GNSRECORD_Data *rd)
{
- struct GNUNET_NAMESTORE_RecordData rd_new;
+ struct GNUNET_GNSRECORD_Data rd_new;
GNUNET_assert (1 == rd_count);
GNUNET_assert (NULL != rd);
if (GNUNET_NO == update_performed)
{
char rd_cmp_data[TEST_RECORD_DATALEN];
- memset (rd_cmp_data, TEST_RECORD_DATA, TEST_RECORD_DATALEN);
+ memset (rd_cmp_data, TEST_RECORD_DATA, TEST_RECORD_DATALEN);
- GNUNET_assert (TEST_RECORD_TYPE == rd[0].record_type);
- GNUNET_assert (TEST_RECORD_DATALEN == rd[0].data_size);
- GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN));
+ GNUNET_assert (TEST_RECORD_TYPE == rd[0].record_type);
+ GNUNET_assert (TEST_RECORD_DATALEN == rd[0].data_size);
+ GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Block was decrypted successfully, updating record \n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Block was decrypted successfully, updating record \n");
- rd_new.expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
- rd_new.record_type = TEST_RECORD_TYPE2;
- rd_new.data_size = TEST_RECORD_DATALEN2;
- rd_new.data = GNUNET_malloc (TEST_RECORD_DATALEN2);
- memset ((char *) rd_new.data, TEST_RECORD_DATA2, TEST_RECORD_DATALEN2);
+ rd_new.flags = GNUNET_GNSRECORD_RF_NONE;
+ rd_new.expiration_time = GNUNET_TIME_absolute_get().abs_value_us + 1000000000;
+ rd_new.record_type = TEST_RECORD_TYPE2;
+ rd_new.data_size = TEST_RECORD_DATALEN2;
+ rd_new.data = GNUNET_malloc (TEST_RECORD_DATALEN2);
+ memset ((char *) rd_new.data, TEST_RECORD_DATA2, TEST_RECORD_DATALEN2);
- nsqe = GNUNET_NAMESTORE_records_store (nsh, privkey, name,
- 1, &rd_new, &put_cont, (void *) name);
- update_performed = GNUNET_YES;
+ nsqe = GNUNET_NAMESTORE_records_store (nsh, privkey, name,
+ 1, &rd_new, &put_cont, (void *) name);
+ update_performed = GNUNET_YES;
}
else
{
char rd_cmp_data[TEST_RECORD_DATALEN2];
- memset (rd_cmp_data, TEST_RECORD_DATA2, TEST_RECORD_DATALEN2);
+ memset (rd_cmp_data, TEST_RECORD_DATA2, TEST_RECORD_DATALEN2);
- GNUNET_assert (TEST_RECORD_TYPE2 == rd[0].record_type);
- GNUNET_assert (TEST_RECORD_DATALEN2 == rd[0].data_size);
- GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN2));
+ GNUNET_assert (TEST_RECORD_TYPE2 == rd[0].record_type);
+ GNUNET_assert (TEST_RECORD_DATALEN2 == rd[0].data_size);
+ GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN2));
- GNUNET_SCHEDULER_add_now (&end, NULL);
+ GNUNET_SCHEDULER_cancel (endbadly_task);
+ endbadly_task = GNUNET_SCHEDULER_NO_TASK;
+ 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;
+ ncqe = NULL;
GNUNET_assert (NULL != cls);
-
- if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task = GNUNET_SCHEDULER_NO_TASK;
- }
-
if (NULL == block)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Namestore returned no block\n"));
+ _("Namecache returned no block for `%s'\n"),
+ name);
if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (endbadly_task);
endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Namestore returned block, decrypting \n");
- GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_block_decrypt(block,
+ "Namecache returned block, decrypting \n");
+ GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_block_decrypt(block,
&pubkey, name, &rd_decrypt_cb, (void *) name));
}
+
static void
put_cont (void *cls, int32_t success, const char *emsg)
{
const char *name = cls;
struct GNUNET_HashCode derived_hash;
+ nsqe = NULL;
GNUNET_assert (NULL != cls);
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Name store added record for `%s': %s\n",
name,
(success == GNUNET_OK) ? "SUCCESS" : "FAIL");
-
/* Create derived hash */
- GNUNET_NAMESTORE_query_from_private_key (privkey, name, &derived_hash);
-
- nsqe = GNUNET_NAMESTORE_lookup_block (nsh, &derived_hash,
- &name_lookup_proc, (void *) name);
+ GNUNET_GNSRECORD_query_from_private_key (privkey,
+ name,
+ &derived_hash);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Looking in namecache for `%s'\n",
+ GNUNET_h2s (&derived_hash));
+ ncqe = GNUNET_NAMECACHE_lookup_block (nch, &derived_hash,
+ &name_lookup_proc, (void *) name);
}
static void
-run (void *cls,
+run (void *cls,
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TESTING_Peer *peer)
{
- struct GNUNET_NAMESTORE_RecordData rd;
+ struct GNUNET_GNSRECORD_Data rd;
char *hostkey_file;
+ directory = NULL;
+ GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory);
+ GNUNET_DISK_directory_remove (directory);
+
update_performed = GNUNET_NO;
- endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+ endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&endbadly, NULL);
GNUNET_asprintf (&hostkey_file,
"zonefiles%s%s",
DIR_SEPARATOR_STR,
"N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
- privkey = GNUNET_CRYPTO_ecc_key_create_from_file (hostkey_file);
+ privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file (hostkey_file);
GNUNET_free (hostkey_file);
GNUNET_assert (privkey != NULL);
- GNUNET_CRYPTO_ecc_key_get_public (privkey, &pubkey);
+ GNUNET_CRYPTO_ecdsa_key_get_public (privkey, &pubkey);
-
- rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
+ rd.flags = GNUNET_GNSRECORD_RF_NONE;
+ rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us + 1000000000;
rd.record_type = TEST_RECORD_TYPE;
rd.data_size = TEST_RECORD_DATALEN;
rd.data = GNUNET_malloc (TEST_RECORD_DATALEN);
nsh = GNUNET_NAMESTORE_connect (cfg);
GNUNET_break (NULL != nsh);
- nsqe = GNUNET_NAMESTORE_records_store (nsh, privkey, name,
- 1, &rd, &put_cont, (void *) name);
+ nch = GNUNET_NAMECACHE_connect (cfg);
+ GNUNET_break (NULL != nch);
+ nsqe = GNUNET_NAMESTORE_records_store (nsh,
+ privkey, name,
+ 1, &rd,
+ &put_cont, (void *) name);
if (NULL == nsqe)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Namestore cannot store no block\n"));
}
-
GNUNET_free ((void *)rd.data);
}
main (int argc, char *argv[])
{
res = 1;
- if (0 !=
- GNUNET_TESTING_service_run ("test-namestore-api-store-update",
- "namestore",
- "test_namestore_api.conf",
- &run,
- NULL))
- return 1;
+ if (0 !=
+ GNUNET_TESTING_peer_run ("test-namestore-api-store-update",
+ "test_namestore_api.conf",
+ &run,
+ NULL))
+ {
+ res = 1;
+ }
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
return res;
}