X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamestore%2Ftest_namestore_api_store_update.c;h=ed5a399bd2f562c96a72358f79d2f574484356b9;hb=c15e7951180d954ca584a95206543e8997b3a7d4;hp=8b10763c0949a8fef0e1fb5444bdbf508f396b4c;hpb=61c39c60565b386e0e12ea669556b030e8cd7180;p=oweals%2Fgnunet.git diff --git a/src/namestore/test_namestore_api_store_update.c b/src/namestore/test_namestore_api_store_update.c index 8b10763c0..ed5a399bd 100644 --- a/src/namestore/test_namestore_api_store_update.c +++ b/src/namestore/test_namestore_api_store_update.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2012, 2013 Christian Grothoff (and other contributing authors) + Copyright (C) 2012, 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 @@ -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. */ /** * @file namestore/test_namestore_api_store_update.c @@ -23,6 +23,7 @@ * @author Matthias Wachs */ #include "platform.h" +#include "gnunet_namecache_service.h" #include "gnunet_namestore_service.h" #include "gnunet_testing_lib.h" @@ -44,11 +45,13 @@ static struct GNUNET_NAMESTORE_Handle *nsh; -static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; +static struct GNUNET_NAMECACHE_Handle *nch; -static struct GNUNET_CRYPTO_EccPrivateKey *privkey; +static struct GNUNET_SCHEDULER_Task * endbadly_task; -static struct GNUNET_CRYPTO_EccPublicSignKey pubkey; +static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; + +static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey; static int res; @@ -56,8 +59,11 @@ static int update_performed; 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 () @@ -67,6 +73,11 @@ cleanup () GNUNET_NAMESTORE_disconnect (nsh); nsh = NULL; } + if (NULL != nch) + { + GNUNET_NAMECACHE_disconnect (nch); + nch = NULL; + } if (NULL != privkey) { GNUNET_free (privkey); @@ -80,25 +91,27 @@ cleanup () * 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) { 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) { cleanup (); res = 0; @@ -112,9 +125,9 @@ 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) + 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); @@ -131,8 +144,8 @@ rd_decrypt_cb (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Block was decrypted successfully, updating record \n"); - rd_new.flags = GNUNET_NAMESTORE_RF_NONE; - rd_new.expiration_time = GNUNET_TIME_absolute_get().abs_value_us; + 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); @@ -151,6 +164,8 @@ rd_decrypt_cb (void *cls, GNUNET_assert (TEST_RECORD_DATALEN2 == rd[0].data_size); GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN2)); + GNUNET_SCHEDULER_cancel (endbadly_task); + endbadly_task = NULL; GNUNET_SCHEDULER_add_now (&end, NULL); } } @@ -158,32 +173,26 @@ rd_decrypt_cb (void *cls, 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")); - if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) + _("Namecache returned no block for `%s'\n"), + name); + if (endbadly_task != NULL) GNUNET_SCHEDULER_cancel (endbadly_task); endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); return; } 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)); } @@ -194,18 +203,21 @@ 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); } @@ -214,9 +226,14 @@ 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_assert (GNUNET_OK == + 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, NULL); @@ -225,13 +242,13 @@ run (void *cls, 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_for_signature (privkey, &pubkey); + GNUNET_CRYPTO_ecdsa_key_get_public (privkey, &pubkey); - rd.flags = GNUNET_NAMESTORE_RF_NONE; - 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); @@ -239,14 +256,17 @@ run (void *cls, 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); } @@ -256,12 +276,18 @@ 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; + 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; }