X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamestore%2Ftest_namestore_api_zone_iteration_specific_zone.c;h=a09cc80739e2bf840cfcb5ceb7bb6db5ef1010b5;hb=392baa82fc240d76b31a353c2d729a6f83f10b2c;hp=3ee452b69947223dbf117b976c63f06619a54b33;hpb=20bef67d7b8a216bd2ebaafb30dbb19770e549c2;p=oweals%2Fgnunet.git diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c index 3ee452b69..a09cc8073 100644 --- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c +++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2009 Christian Grothoff (and other contributing authors) + Copyright (C) 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 @@ -14,40 +14,30 @@ 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_zone_iteration_specific_zone.c - * @brief testcase for zone iteration functionality: iterate of a specific zone + * @brief testcase for zone iteration functionality: iterate over a specific zone + * @author Matthias Wachs */ #include "platform.h" -#include "gnunet_common.h" -#include "gnunet_testing_lib-new.h" #include "gnunet_namestore_service.h" +#include "gnunet_testing_lib.h" #include "namestore.h" -#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10) +#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100) static struct GNUNET_NAMESTORE_Handle * nsh; -static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; +static struct GNUNET_SCHEDULER_Task * endbadly_task; -static GNUNET_SCHEDULER_TaskIdentifier stopiteration_task; +static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; -static struct GNUNET_CRYPTO_RsaPrivateKey * privkey; - -static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey; - -static struct GNUNET_CRYPTO_ShortHashCode zone; - -static struct GNUNET_CRYPTO_RsaPrivateKey * privkey2; - -static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey2; - -static struct GNUNET_CRYPTO_ShortHashCode zone2; +static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey2; static struct GNUNET_NAMESTORE_ZoneIterator *zi; @@ -55,24 +45,19 @@ static int res; static int returned_records; -static struct GNUNET_CRYPTO_RsaSignature *sig_1; - static char * s_name_1; -static struct GNUNET_NAMESTORE_RecordData *s_rd_1; - -static struct GNUNET_CRYPTO_RsaSignature *sig_2; +static struct GNUNET_GNSRECORD_Data *s_rd_1; static char * s_name_2; -static struct GNUNET_NAMESTORE_RecordData *s_rd_2; - -static struct GNUNET_CRYPTO_RsaSignature *sig_3; +static struct GNUNET_GNSRECORD_Data *s_rd_2; static char * s_name_3; -static struct GNUNET_NAMESTORE_RecordData *s_rd_3; +static struct GNUNET_GNSRECORD_Data *s_rd_3; +static char *directory; /** * Re-establish the connection to the service. @@ -83,21 +68,20 @@ static struct GNUNET_NAMESTORE_RecordData *s_rd_3; static void endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - if (stopiteration_task != GNUNET_SCHEDULER_NO_TASK) - { - GNUNET_SCHEDULER_cancel (stopiteration_task); - stopiteration_task = GNUNET_SCHEDULER_NO_TASK; - } + if (NULL != zi) + { + GNUNET_NAMESTORE_zone_iteration_stop (zi); + zi = NULL; + } if (nsh != NULL) GNUNET_NAMESTORE_disconnect (nsh); nsh = NULL; - GNUNET_free_non_null(sig_1); - GNUNET_free_non_null(sig_2); - GNUNET_free_non_null(sig_3); + GNUNET_free_non_null(s_name_1); GNUNET_free_non_null(s_name_2); GNUNET_free_non_null(s_name_3); + if (s_rd_1 != NULL) { GNUNET_free ((void *)s_rd_1->data); @@ -115,11 +99,11 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } if (privkey != NULL) - GNUNET_CRYPTO_rsa_key_free (privkey); + GNUNET_free (privkey); privkey = NULL; if (privkey2 != NULL) - GNUNET_CRYPTO_rsa_key_free (privkey2); + GNUNET_free (privkey2); privkey2 = NULL; res = 1; } @@ -128,26 +112,26 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - if (stopiteration_task != GNUNET_SCHEDULER_NO_TASK) - { - GNUNET_SCHEDULER_cancel (stopiteration_task); - stopiteration_task = GNUNET_SCHEDULER_NO_TASK; - } - if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) + if (NULL != zi) + { + GNUNET_NAMESTORE_zone_iteration_stop (zi); + zi = NULL; + } + + if (endbadly_task != NULL) { GNUNET_SCHEDULER_cancel (endbadly_task); - endbadly_task = GNUNET_SCHEDULER_NO_TASK; + endbadly_task = NULL; } + if (privkey != NULL) - GNUNET_CRYPTO_rsa_key_free (privkey); + GNUNET_free (privkey); privkey = NULL; + if (privkey2 != NULL) - GNUNET_CRYPTO_rsa_key_free (privkey2); + GNUNET_free (privkey2); privkey2 = NULL; - GNUNET_free (sig_1); - GNUNET_free (sig_2); - GNUNET_free (sig_3); GNUNET_free (s_name_1); GNUNET_free (s_name_2); GNUNET_free (s_name_3); @@ -174,34 +158,39 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void zone_proc (void *cls, - const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key, - struct GNUNET_TIME_Absolute expire, - const char *name, - unsigned int rd_count, - const struct GNUNET_NAMESTORE_RecordData *rd, - const struct GNUNET_CRYPTO_RsaSignature *signature) + const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, + const char *label, + unsigned int rd_count, + const struct GNUNET_GNSRECORD_Data *rd) { int failed = GNUNET_NO; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for zone `%s'\n", GNUNET_short_h2s (&zone)); - if ((zone_key == NULL) && (name == NULL)) + if ((zone == NULL) && (label == NULL)) { GNUNET_break (2 == returned_records); if (2 == returned_records) - res = 0; + { + res = 0; /* Last iteraterator callback, we are done */ + zi = NULL; + } else res = 1; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received last result, iteration done after %u records\n", returned_records); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Received last result, iteration done after receing %u results\n", + returned_records ); GNUNET_SCHEDULER_add_now (&end, NULL); + return; } - else + GNUNET_assert (NULL != zone); + if (0 == memcmp (zone, + privkey, + sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Comparing results name %s \n", name); - if (0 == strcmp (name, s_name_1)) + if (0 == strcmp (label, s_name_1)) { if (rd_count == 1) { - if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_1)) + if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp (rd, s_rd_1)) { failed = GNUNET_YES; GNUNET_break (0); @@ -212,17 +201,12 @@ zone_proc (void *cls, failed = GNUNET_YES; GNUNET_break (0); } - if (0 != memcmp (signature, sig_1, sizeof (struct GNUNET_CRYPTO_RsaSignature))) - { - failed = GNUNET_YES; - GNUNET_break (0); - } } - else if (0 == strcmp (name, s_name_2)) + else if (0 == strcmp (label, s_name_2)) { if (rd_count == 1) { - if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_2)) + if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_2)) { failed = GNUNET_YES; GNUNET_break (0); @@ -230,35 +214,47 @@ zone_proc (void *cls, } else { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Received invalid record count\n"); failed = GNUNET_YES; GNUNET_break (0); } - if (0 != memcmp (signature, sig_2, sizeof (struct GNUNET_CRYPTO_RsaSignature))) - { - failed = GNUNET_YES; - GNUNET_break (0); - } - } - else - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Comparing result failed: got name `%s'\n", name); - res = 1; - GNUNET_break (0); - GNUNET_SCHEDULER_add_now (&end, NULL); - } - - if (failed == GNUNET_NO) - { - returned_records ++; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Telling namestore to send the next result\n"); - GNUNET_NAMESTORE_zone_iterator_next (zi); } else { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Comparing result failed: got name `%s' for first zone\n", + label); + failed = GNUNET_YES; GNUNET_break (0); - GNUNET_SCHEDULER_add_now (&end, NULL); } } + else if (0 == memcmp (zone, privkey2, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Received data for not requested zone\n"); + failed = GNUNET_YES; + GNUNET_break (0); + } + else + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Received invalid zone\n"); + failed = GNUNET_YES; + GNUNET_break (0); + } + if (failed == GNUNET_NO) + { + returned_records ++; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Telling namestore to send the next result\n"); + GNUNET_NAMESTORE_zone_iterator_next (zi); + } + else + { + GNUNET_break (0); + GNUNET_SCHEDULER_add_now (&end, NULL); + } } @@ -270,108 +266,173 @@ put_cont (void *cls, int32_t success, const char *emsg) if (success == GNUNET_OK) { c++; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record %u \n", c); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Created record %u \n", c); } else { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to created records\n"); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Failed to created records: `%s'\n", + emsg); GNUNET_break (0); - GNUNET_SCHEDULER_cancel (endbadly_task); + if (NULL != endbadly_task) + GNUNET_SCHEDULER_cancel (endbadly_task); endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); + return; } if (c == 3) { res = 1; returned_records = 0; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All records created, starting iteration over zone `%s'\n", - GNUNET_short_h2s(&zone)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "All records created, starting iteration over all zones \n"); zi = GNUNET_NAMESTORE_zone_iteration_start(nsh, - &zone, - GNUNET_NAMESTORE_RF_NONE, - GNUNET_NAMESTORE_RF_NONE, - zone_proc, - &zone); + privkey, + &zone_proc, + NULL); if (zi == NULL) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone iterator\n"); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Failed to create zone iterator\n"); GNUNET_break (0); - GNUNET_SCHEDULER_cancel (endbadly_task); + if (NULL != endbadly_task) + GNUNET_SCHEDULER_cancel (endbadly_task); endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); + return; } } } -static struct GNUNET_NAMESTORE_RecordData * +static struct GNUNET_GNSRECORD_Data * create_record (unsigned int count) { unsigned int c; - struct GNUNET_NAMESTORE_RecordData * rd; + struct GNUNET_GNSRECORD_Data * rd; - rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData)); + rd = GNUNET_malloc (count * sizeof (struct GNUNET_GNSRECORD_Data)); for (c = 0; c < count; c++) { - rd[c].expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS).abs_value; + rd[c].expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS).abs_value_us; rd[c].record_type = 1111; rd[c].data_size = 50; rd[c].data = GNUNET_malloc(50); + rd[c].flags = 0; memset ((char *) rd[c].data, 'a', 50); } return rd; } +/** + * Callback called from the zone iterator when we iterate over + * the empty zone. Check that we got no records and then + * start the actual tests by filling the zone. + */ static void -run (void *cls, - const struct GNUNET_CONFIGURATION_Handle *cfg, - struct GNUNET_TESTING_Peer *peer) +empty_zone_proc (void *cls, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, + const char *label, + unsigned int rd_count, + const struct GNUNET_GNSRECORD_Data *rd) { char *hostkey_file; - struct GNUNET_TIME_Absolute et; - endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,&endbadly, NULL); + GNUNET_assert (nsh == cls); + if (NULL != zone) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Expected empty zone but received zone private key\n")); + GNUNET_break (0); + if (endbadly_task != NULL) + GNUNET_SCHEDULER_cancel (endbadly_task); + endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); + return; + } + if ((NULL != label) || (NULL != rd) || (0 != rd_count)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Expected no zone content but received data\n")); + GNUNET_break (0); + if (endbadly_task != NULL) + GNUNET_SCHEDULER_cancel (endbadly_task); + endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); + return; + } + + + zi = 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_rsa_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_rsa_key_get_public(privkey, &pubkey); - GNUNET_CRYPTO_short_hash (&pubkey, sizeof (pubkey), &zone); GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); - privkey2 = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); + privkey2 = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file); GNUNET_free (hostkey_file); GNUNET_assert (privkey2 != NULL); - GNUNET_CRYPTO_rsa_key_get_public(privkey2, &pubkey2); - GNUNET_CRYPTO_short_hash (&pubkey2, sizeof (pubkey), &zone2); - nsh = GNUNET_NAMESTORE_connect (cfg); - GNUNET_break (NULL != nsh); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 1\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Created record 1\n"); + GNUNET_asprintf(&s_name_1, "dummy1"); s_rd_1 = create_record(1); - et.abs_value = s_rd_1[0].expiration_time; - sig_1 = GNUNET_NAMESTORE_create_signature(privkey, et, s_name_1, s_rd_1, 1); - GNUNET_NAMESTORE_record_create(nsh, privkey, s_name_1, s_rd_1, &put_cont, NULL); + GNUNET_NAMESTORE_records_store(nsh, privkey, s_name_1, + 1, s_rd_1, &put_cont, NULL); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 2 \n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Created record 2 \n"); GNUNET_asprintf(&s_name_2, "dummy2"); s_rd_2 = create_record(1); - et.abs_value = s_rd_2[0].expiration_time; - sig_2 = GNUNET_NAMESTORE_create_signature(privkey, et, s_name_2, s_rd_2, 1); - GNUNET_NAMESTORE_record_create(nsh, privkey, s_name_2, s_rd_2, &put_cont, NULL); + GNUNET_NAMESTORE_records_store(nsh, privkey, s_name_2, + 1, s_rd_2, &put_cont, NULL); + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Created record 3\n"); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 3\n"); /* name in different zone */ GNUNET_asprintf(&s_name_3, "dummy3"); s_rd_3 = create_record(1); - et.abs_value = s_rd_3[0].expiration_time; - sig_3 = GNUNET_NAMESTORE_create_signature(privkey, et, s_name_3, s_rd_3, 1); - GNUNET_NAMESTORE_record_put (nsh, &pubkey2, s_name_3, GNUNET_TIME_UNIT_FOREVER_ABS, 1, s_rd_3, sig_3, &put_cont, NULL); + GNUNET_NAMESTORE_records_store(nsh, privkey2, s_name_3, + 1, s_rd_3, &put_cont, NULL); +} + + +static void +run (void *cls, + const struct GNUNET_CONFIGURATION_Handle *cfg, + struct GNUNET_TESTING_Peer *peer) +{ + 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); + nsh = GNUNET_NAMESTORE_connect (cfg); + GNUNET_break (NULL != nsh); + /* first, iterate over empty namestore */ + zi = GNUNET_NAMESTORE_zone_iteration_start (nsh, + NULL, + &empty_zone_proc, nsh); + if (NULL == zi) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Failed to create zone iterator\n"); + GNUNET_break (0); + GNUNET_SCHEDULER_cancel (endbadly_task); + endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); + } } @@ -379,13 +440,19 @@ int main (int argc, char *argv[]) { res = 1; - if (0 != - GNUNET_TESTING_service_run ("test-namestore-api-zone-iteration-specific-zone", - "namestore", - "test_namestore_api.conf", - &run, - NULL)) - return 1; + if (0 != + GNUNET_TESTING_peer_run ("test-namestore-api-zone-iteration", + "test_namestore_api.conf", + &run, + NULL)) + { + res = 1; + } + if (NULL != directory) + { + GNUNET_DISK_directory_remove (directory); + GNUNET_free (directory); + } return res; }