X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamestore%2Ftest_namestore_api_zone_to_name.c;h=2bc7d34a3bb1f8396ca135988fe83d5e0b1741cb;hb=5d9d356c1426eb6f1b1e5b9f12b28d6a9faf410f;hp=0e29b8b330a8ddf1b1fd9c0e569dc09d10909e91;hpb=ee0de607e52152c03a865559422dad4faacad53d;p=oweals%2Fgnunet.git diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c index 0e29b8b33..2bc7d34a3 100644 --- a/src/namestore/test_namestore_api_zone_to_name.c +++ b/src/namestore/test_namestore_api_zone_to_name.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2009 Christian Grothoff (and other contributing authors) + Copyright (C) 2009 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,19 +14,17 @@ 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_to_name.c * @brief testcase for zone to name translation */ #include "platform.h" -#include "gnunet_common.h" #include "gnunet_namestore_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "namestore.h" -#include "gnunet_signatures.h" #define RECORDS 5 @@ -36,96 +34,108 @@ #define TEST_RECORD_DATA 'a' -#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 struct GNUNET_NAMESTORE_Handle *nsh; -static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; +static struct GNUNET_SCHEDULER_Task *endbadly_task; -static struct GNUNET_CRYPTO_RsaPrivateKey * privkey; +static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; -static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey; +static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey; -static struct GNUNET_TIME_Absolute expire; - -static struct GNUNET_CRYPTO_ShortHashCode s_zone; - -static struct GNUNET_CRYPTO_ShortHashCode s_zone_value; +static struct GNUNET_CRYPTO_EcdsaPublicKey s_zone_value; static char * s_name; -static struct GNUNET_CRYPTO_RsaSignature *s_signature; - static int res; +static char *directory; + +static struct GNUNET_NAMESTORE_QueueEntry *qe; + /** * 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 (nsh != NULL) - GNUNET_NAMESTORE_disconnect (nsh); - nsh = NULL; - if (privkey != NULL) - GNUNET_CRYPTO_rsa_key_free (privkey); - privkey = NULL; + (void) cls; + GNUNET_SCHEDULER_shutdown (); res = 1; } static void -end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +end (void *cls) { - if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) + if (NULL != qe) + { + GNUNET_NAMESTORE_cancel (qe); + qe = NULL; + } + if (NULL != endbadly_task) { GNUNET_SCHEDULER_cancel (endbadly_task); - endbadly_task = GNUNET_SCHEDULER_NO_TASK; + endbadly_task = NULL; } - if (privkey != NULL) - GNUNET_CRYPTO_rsa_key_free (privkey); - privkey = NULL; - if (nsh != NULL) + if (NULL != privkey) + { + GNUNET_free (privkey); + privkey = NULL; + } + if (NULL != nsh) + { GNUNET_NAMESTORE_disconnect (nsh); - nsh = NULL; + nsh = NULL; + } } static void zone_to_name_proc (void *cls, - const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key, - struct GNUNET_TIME_Absolute expire, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key, const char *n, unsigned int rd_count, - const struct GNUNET_NAMESTORE_RecordData *rd, - const struct GNUNET_CRYPTO_RsaSignature *signature) + const struct GNUNET_GNSRECORD_Data *rd) { int fail = GNUNET_NO; - if ((zone_key == NULL) && (n == NULL) && (rd_count == 0) && (rd == NULL) && (signature == NULL)) + qe = NULL; + if ( (NULL == zone_key) && + (NULL == n) && + (0 == rd_count) && + (NULL == rd) ) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No result found\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "No result found\n"); res = 1; } else { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Result found: `%s'\n", n); - if ((n == NULL) || (0 != strcmp(n, s_name))) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Result found: `%s'\n", + n); + if ( (NULL == n) || + (0 != strcmp (n, + s_name))) { fail = GNUNET_YES; GNUNET_break (0); } - if (rd_count != 1) + if (1 != rd_count) { fail = GNUNET_YES; GNUNET_break (0); } - if ((zone_key == NULL) || (0 != memcmp (zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded)))) + if ( (NULL == zone_key) || + (0 != memcmp (zone_key, + privkey, + sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))) { fail = GNUNET_YES; GNUNET_break (0); @@ -135,28 +145,54 @@ zone_to_name_proc (void *cls, else res = 1; } - GNUNET_SCHEDULER_add_now(&end, NULL); + GNUNET_SCHEDULER_add_now (&end, + NULL); } static void -put_cont (void *cls, int32_t success, const char *emsg) +error_cb (void *cls) +{ + (void) cls; + qe = NULL; + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Not found!\n"); + GNUNET_SCHEDULER_shutdown (); + res = 2; +} + + +static void +put_cont (void *cls, + int32_t success, + const char *emsg) { char *name = cls; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Name store added record for `%s': %s\n", name, (success == GNUNET_OK) ? "SUCCESS" : "FAIL"); + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Name store added record for `%s': %s\n", + name, + (success == GNUNET_OK) ? "SUCCESS" : emsg); if (success == GNUNET_OK) { res = 0; - /* create initial record */ - GNUNET_NAMESTORE_zone_to_name (nsh, &s_zone, &s_zone_value, zone_to_name_proc, NULL); - + qe = GNUNET_NAMESTORE_zone_to_name (nsh, + privkey, + &s_zone_value, + &error_cb, + NULL, + &zone_to_name_proc, + NULL); } else { res = 1; - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to put records for name `%s'\n", name); - GNUNET_SCHEDULER_add_now(&end, NULL); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Failed to put records for name `%s'\n", + name); + GNUNET_SCHEDULER_add_now (&end, + NULL); } } @@ -166,56 +202,86 @@ run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg, struct GNUNET_TESTING_Peer *peer) { - struct GNUNET_TIME_Absolute et; - - endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL); - GNUNET_asprintf(&s_name, "dummy"); + (void) cls; + (void) 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); + GNUNET_SCHEDULER_add_shutdown (&end, + NULL); + GNUNET_asprintf (&s_name, "dummy"); /* load privat key */ - char *hostkey_file; - 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); - GNUNET_free (hostkey_file); - GNUNET_assert (privkey != NULL); + { + char *zonekey_file; + + GNUNET_asprintf (&zonekey_file, + "zonefiles%s%s", + DIR_SEPARATOR_STR, + "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Using zonekey file `%s'\n", + zonekey_file); + privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file (zonekey_file); + GNUNET_free (zonekey_file); + } + GNUNET_assert (NULL != privkey); /* get public key */ - GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey); - - /* zone hash */ - GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone); - GNUNET_CRYPTO_short_hash (s_name, strlen (s_name) + 1, &s_zone_value); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using PKEY `%s' \n", GNUNET_short_h2s (&s_zone_value)); - - struct GNUNET_NAMESTORE_RecordData rd; - rd.expiration_time = GNUNET_TIME_absolute_get().abs_value; - rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY; - rd.data_size = sizeof (struct GNUNET_CRYPTO_ShortHashCode); - rd.data = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_ShortHashCode)); - memcpy ((char *) rd.data, &s_zone_value, sizeof (struct GNUNET_CRYPTO_ShortHashCode)); - nsh = GNUNET_NAMESTORE_connect (cfg); - GNUNET_break (NULL != nsh); - - expire = GNUNET_TIME_absolute_get (); - et.abs_value = rd.expiration_time; - s_signature = GNUNET_NAMESTORE_create_signature(privkey, et, s_name, &rd, 1); - GNUNET_NAMESTORE_record_put(nsh, &pubkey, s_name, expire, 1, &rd, s_signature, put_cont, NULL); - - GNUNET_free ((void *) rd.data); -} + GNUNET_CRYPTO_ecdsa_key_get_public (privkey, + &pubkey); + GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, + &s_zone_value, + sizeof (s_zone_value)); + { + struct GNUNET_GNSRECORD_Data rd; + + rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us; + rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY; + rd.data_size = sizeof (s_zone_value); + rd.data = &s_zone_value; + rd.flags = 0; + + nsh = GNUNET_NAMESTORE_connect (cfg); + GNUNET_break (NULL != nsh); + GNUNET_NAMESTORE_records_store (nsh, + privkey, + s_name, + 1, + &rd, + &put_cont, + NULL); + } +} int -main (int argc, char *argv[]) +main (int argc, + char *argv[]) { + (void) argc; + (void) argv; res = 1; - if (0 != - GNUNET_TESTING_service_run ("test-namestore-api-zone-to-name", - "namestore", - "test_namestore_api.conf", - &run, - NULL)) - return 1; + if (0 != + GNUNET_TESTING_peer_run ("test-namestore-api-zone-to-name", + "test_namestore_api.conf", + &run, + NULL)) + { + res = 1; + } + if (NULL != directory) + { + GNUNET_DISK_directory_remove (directory); + GNUNET_free (directory); + } return res; }