X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamestore%2Ftest_namestore_api_zone_to_name.c;h=31ec84a81f3f0ae292105aa5affb2b596f16effb;hb=392baa82fc240d76b31a353c2d729a6f83f10b2c;hp=ba15389f06ae8cb487c797c2829e26330f977bf9;hpb=5e828dc0248330d772913795257b3fda14fe9552;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 ba15389f0..31ec84a81 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 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,73 +14,50 @@ 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.h" #include "namestore.h" -#include "gnunet_signatures.h" - -#define VERBOSE GNUNET_NO #define RECORDS 5 + #define TEST_RECORD_TYPE 1234 + #define TEST_RECORD_DATALEN 123 + #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 GNUNET_SCHEDULER_TaskIdentifier endbadly_task; -static struct GNUNET_OS_Process *arm; +static struct GNUNET_SCHEDULER_Task * endbadly_task; -static struct GNUNET_CRYPTO_RsaPrivateKey * privkey; -static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey; +static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; -struct GNUNET_TIME_Absolute expire; +static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey; -static GNUNET_HashCode s_zone; -static GNUNET_HashCode s_zone_value; +static struct GNUNET_TIME_Absolute expire; -char * s_name; +static struct GNUNET_CRYPTO_ShortHashCode s_zone; -struct GNUNET_NAMESTORE_RecordData *s_rd; -struct GNUNET_CRYPTO_RsaSignature *s_signature; +static struct GNUNET_CRYPTO_ShortHashCode s_zone_value; -static int res; +static char * s_name; -static void -start_arm (const char *cfgname) -{ - arm = GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm", - "gnunet-service-arm", "-c", cfgname, -#if VERBOSE_PEERS - "-L", "DEBUG", -#else - "-L", "ERROR", -#endif - NULL); -} +static struct GNUNET_CRYPTO_EcdsaSignature *s_signature; -static void -stop_arm () -{ - if (NULL != arm) - { - if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); - GNUNET_OS_process_wait (arm); - GNUNET_OS_process_close (arm); - arm = NULL; - } -} +static int res; + +static char *directory; /** * Re-establish the connection to the service. @@ -92,16 +69,11 @@ static void endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { if (nsh != NULL) - GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES); + GNUNET_NAMESTORE_disconnect (nsh); nsh = NULL; - if (privkey != NULL) - GNUNET_CRYPTO_rsa_key_free (privkey); + GNUNET_free (privkey); privkey = NULL; - - if (NULL != arm) - stop_arm(); - res = 1; } @@ -109,31 +81,28 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) + 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 (nsh != NULL) - GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES); + GNUNET_NAMESTORE_disconnect (nsh); nsh = NULL; - - if (NULL != arm) - stop_arm(); } -void zone_to_name_proc (void *cls, - const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key, - struct GNUNET_TIME_Absolute expire, - const char *n, - unsigned int rd_count, - const struct GNUNET_NAMESTORE_RecordData *rd, - const struct GNUNET_CRYPTO_RsaSignature *signature) + +static void +zone_to_name_proc (void *cls, + const struct GNUNET_CRYPTO_EcdsaPublicKey *zone_key, + struct GNUNET_TIME_Absolute expire, + const char *n, + unsigned int rd_count, + const struct GNUNET_GNSRECORD_Data *rd, + const struct GNUNET_CRYPTO_EcdsaSignature *signature) { int fail = GNUNET_NO; @@ -155,7 +124,7 @@ void zone_to_name_proc (void *cls, fail = GNUNET_YES; GNUNET_break (0); } - if ((zone_key == NULL) || (0 != memcmp (zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded)))) + if ((zone_key == NULL) || (0 != memcmp (zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)))) { fail = GNUNET_YES; GNUNET_break (0); @@ -169,26 +138,7 @@ void zone_to_name_proc (void *cls, } -void -delete_existing_db (const struct GNUNET_CONFIGURATION_Handle *cfg) -{ - char *afsdir; - - if (GNUNET_OK == - GNUNET_CONFIGURATION_get_value_filename (cfg, "namestore-sqlite", - "FILENAME", &afsdir)) - { - if (GNUNET_OK == GNUNET_DISK_file_test (afsdir)) - if (GNUNET_OK == GNUNET_DISK_file_test (afsdir)) - if (GNUNET_OK == GNUNET_DISK_directory_remove(afsdir)) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deleted existing database `%s' \n", afsdir); - GNUNET_free (afsdir); - } - -} - - -void +static void put_cont (void *cls, int32_t success, const char *emsg) { char *name = cls; @@ -204,83 +154,84 @@ put_cont (void *cls, int32_t success, const char *emsg) else { res = 1; - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to put records for name `%s'\n", name); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Failed to put records for name `%s'\n", name); GNUNET_SCHEDULER_add_now(&end, NULL); } } + static void -run (void *cls, char *const *args, const char *cfgfile, - const struct GNUNET_CONFIGURATION_Handle *cfg) +run (void *cls, + const struct GNUNET_CONFIGURATION_Handle *cfg, + struct GNUNET_TESTING_Peer *peer) { - delete_existing_db(cfg); - - endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL); - GNUNET_asprintf(&s_name, "dummy.dummy.gnunet"); + struct GNUNET_TIME_Absolute et; + directory = NULL; + 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 (&s_name, "dummy"); /* load privat key */ char *hostkey_file; - GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "4UCICULTINKC87UO4326KEEDQ9MTEP2AJT88MJFVGTGNK12QNGMQI2S41VI07UUU6EO19BTB06PDL0HE6VP1OM50HOJEI75RHP4JP80.zone"); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); - privkey = GNUNET_CRYPTO_rsa_key_create_from_file(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_ecdsa_key_create_from_file(hostkey_file); GNUNET_free (hostkey_file); GNUNET_assert (privkey != NULL); /* get public key */ - GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey); + GNUNET_CRYPTO_ecdsa_key_get_public(privkey, &pubkey); /* zone hash */ - GNUNET_CRYPTO_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone); - GNUNET_CRYPTO_hash (s_name, strlen (s_name) + 1, &s_zone_value); - - struct GNUNET_NAMESTORE_RecordData rd; - rd.expiration = GNUNET_TIME_absolute_get(); - rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY; - rd.data_size = sizeof (GNUNET_HashCode); - rd.data = GNUNET_malloc(sizeof (GNUNET_HashCode)); - memcpy ((char *) rd.data, &s_zone_value, sizeof (GNUNET_HashCode)); - - start_arm (cfgfile); - GNUNET_assert (arm != NULL); - + GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey), &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_NAMESTORE_short_h2s (&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 (struct GNUNET_CRYPTO_ShortHashCode); + rd.data = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_ShortHashCode)); + rd.flags = 0; + 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 (); - s_signature = GNUNET_NAMESTORE_create_signature(privkey, rd.expiration, s_name, &rd, 1); + et.abs_value_us = 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); } -static int -check () -{ - static char *const argv[] = { "test-namestore-api", - "-c", - "test_namestore_api.conf", -#if VERBOSE - "-L", "DEBUG", -#endif - NULL - }; - static struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_OPTION_END - }; - res = 1; - GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, "test-namestore-api", - "nohelp", options, &run, &res); - return res; -} int main (int argc, char *argv[]) { - int ret; - - ret = check (); - return ret; + res = 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; } -/* end of test_namestore_api.c */ +/* end of test_namestore_api_zone_to_name.c */