X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamestore%2Ftest_namestore_api_store.c;h=d80676770180898c6bf0fd0955d136c19e5f3b1a;hb=284cfac7a521ad275b7536ce1075f62b6e45ea44;hp=69c47337fc22976492699bd2146c49cae20ce43a;hpb=61c39c60565b386e0e12ea669556b030e8cd7180;p=oweals%2Fgnunet.git diff --git a/src/namestore/test_namestore_api_store.c b/src/namestore/test_namestore_api_store.c index 69c47337f..d80676770 100644 --- a/src/namestore/test_namestore_api_store.c +++ b/src/namestore/test_namestore_api_store.c @@ -1,6 +1,6 @@ /* 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 @@ -14,12 +14,12 @@ 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.c - * @brief testcase for namestore_api.c: store a record and perform a lookup + * @file namestore/test_namestore_api_store.c + * @brief testcase for namestore_api.c: store a record */ #include "platform.h" #include "gnunet_namestore_service.h" @@ -36,16 +36,17 @@ static struct GNUNET_NAMESTORE_Handle *nsh; -static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; +static struct GNUNET_SCHEDULER_Task * endbadly_task; -static struct GNUNET_CRYPTO_EccPrivateKey *privkey; +static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; -static struct GNUNET_CRYPTO_EccPublicSignKey pubkey; +static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey; static int res; static struct GNUNET_NAMESTORE_QueueEntry *nsqe; +static char *directory; static void cleanup () @@ -68,10 +69,9 @@ 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) { @@ -84,84 +84,27 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 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) -{ - char rd_cmp_data[TEST_RECORD_DATALEN]; - - GNUNET_assert (1 == rd_count); - GNUNET_assert (NULL != rd); - - memset (rd_cmp_data, 'a', 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 \n"); - - GNUNET_SCHEDULER_add_now (&end, NULL); -} - -static void -name_lookup_proc (void *cls, - const struct GNUNET_NAMESTORE_Block *block) -{ - const char *name = cls; - nsqe = 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) - 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, - &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_SCHEDULER_cancel (endbadly_task); + endbadly_task = NULL; + GNUNET_SCHEDULER_add_now (&end, NULL); } @@ -170,10 +113,15 @@ 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; const char * name = "dummy.dummy.gnunet"; + directory = NULL; + GNUNET_assert (GNUNET_OK == + GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory)); + GNUNET_DISK_directory_remove (directory); + endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &endbadly, NULL); GNUNET_asprintf (&hostkey_file, @@ -181,16 +129,17 @@ 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.expiration_time = GNUNET_TIME_absolute_get().abs_value_us; 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); nsh = GNUNET_NAMESTORE_connect (cfg); @@ -212,14 +161,20 @@ main (int argc, char *argv[]) { res = 1; if (0 != - GNUNET_TESTING_service_run ("test-namestore-api", - "namestore", - "test_namestore_api.conf", - &run, - NULL)) - return 1; + GNUNET_TESTING_peer_run ("test-namestore-api", + "test_namestore_api.conf", + &run, + NULL)) + { + res = 1; + } + if (NULL != directory) + { + GNUNET_DISK_directory_remove (directory); + GNUNET_free (directory); + } return res; } -/* end of test_namestore_api.c */ +/* end of test_namestore_api_store.c */