X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamestore%2Ftest_namestore_api_remove_not_existing_record.c;h=ef199cdf601155a57297a737e28005ce007f72ea;hb=284cfac7a521ad275b7536ce1075f62b6e45ea44;hp=8c3227874b6ef5dd2aa7af90f97778c408ee03e9;hpb=46a63dc665f31fa7d42639ab6adabbdb1af239c8;p=oweals%2Fgnunet.git diff --git a/src/namestore/test_namestore_api_remove_not_existing_record.c b/src/namestore/test_namestore_api_remove_not_existing_record.c index 8c3227874..ef199cdf6 100644 --- a/src/namestore/test_namestore_api_remove_not_existing_record.c +++ b/src/namestore/test_namestore_api_remove_not_existing_record.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2009 Christian Grothoff (and other contributing authors) + Copyright (C) 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,286 +14,174 @@ 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 + * @file namestore/test_namestore_api_remove_not_existing_record.c * @brief testcase for namestore_api.c */ #include "platform.h" -#include "gnunet_common.h" #include "gnunet_namestore_service.h" -#include "namestore.h" -#include "gnunet_signatures.h" +#include "gnunet_testing_lib.h" -#define VERBOSE GNUNET_NO - -#define RECORDS 5 #define TEST_RECORD_TYPE 1234 + #define TEST_RECORD_DATALEN 123 -#define TEST_RECORD_DATA 'a' -#define TEST_REMOVE_RECORD_TYPE 4321 -#define TEST_REMOVE_RECORD_DATALEN 255 -#define TEST_REMOVE_RECORD_DATA 'b' +#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_NAMESTORE_Handle *nsh; -static struct GNUNET_CRYPTO_RsaPrivateKey * privkey; -static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey; -struct GNUNET_CRYPTO_RsaSignature *s_signature; -static GNUNET_HashCode s_zone; -struct GNUNET_NAMESTORE_RecordData *s_rd; -static char *s_name; +static struct GNUNET_SCHEDULER_Task * endbadly_task; +static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; +static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey; static int res; -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_NAMESTORE_QueueEntry *nsqe; + +static char *directory; static void -stop_arm () +cleanup () { - if (NULL != arm) + if (NULL != nsh) + { + GNUNET_NAMESTORE_disconnect (nsh); + nsh = NULL; + } + if (NULL != privkey) { - if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); - GNUNET_OS_process_wait (arm); - GNUNET_OS_process_destroy (arm); - arm = NULL; + GNUNET_free (privkey); + privkey = NULL; } + GNUNET_SCHEDULER_shutdown (); } + /** * 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, GNUNET_YES); - nsh = NULL; - - if (privkey != NULL) - GNUNET_CRYPTO_rsa_key_free (privkey); - privkey = NULL; - - if (NULL != arm) - stop_arm(); - + if (NULL != nsqe) + { + GNUNET_NAMESTORE_cancel (nsqe); + nsqe = NULL; + } + cleanup (); res = 1; } static void -end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +end (void *cls) { - if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) - { - GNUNET_SCHEDULER_cancel (endbadly_task); - endbadly_task = GNUNET_SCHEDULER_NO_TASK; - } - - int c; - for (c = 0; c < RECORDS; c++) - GNUNET_free_non_null((void *) s_rd[c].data); - GNUNET_free (s_rd); - - if (privkey != NULL) - GNUNET_CRYPTO_rsa_key_free (privkey); - privkey = NULL; - - if (nsh != NULL) - GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES); - nsh = NULL; - - if (NULL != arm) - stop_arm(); + cleanup (); + res = 0; } -void -remove_cont (void *cls, int32_t success, const char *emsg) -{ - char *name = cls; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Remove record for `%s': %s `%s'\n", name, (success == GNUNET_YES) ? "SUCCESS" : "FAIL", emsg); - if (GNUNET_NO == success) - { - res = 0; - } - else - { - res = 1; - GNUNET_break (0); - } - GNUNET_SCHEDULER_add_now(&end, NULL); -} -void +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"); - if (success == GNUNET_OK) + GNUNET_assert (NULL != cls); + nsqe = NULL; + if (endbadly_task != NULL) { - res = 0; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing non existing record for `%s'\n", name); - - struct GNUNET_NAMESTORE_RecordData rd; - char data[TEST_REMOVE_RECORD_DATALEN]; - rd.expiration = GNUNET_TIME_absolute_get(); - rd.record_type = TEST_REMOVE_RECORD_TYPE; - rd.data_size = TEST_REMOVE_RECORD_DATALEN; - rd.data = &data; - - GNUNET_NAMESTORE_record_remove (nsh, privkey, name, &rd, &remove_cont, name); - } - 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_SCHEDULER_cancel (endbadly_task); + endbadly_task = NULL; } -} -static struct GNUNET_NAMESTORE_RecordData * -create_record (int count) -{ - int c; - struct GNUNET_NAMESTORE_RecordData * rd; - rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData)); - - for (c = 0; c < RECORDS; c++) - { - rd[c].expiration = GNUNET_TIME_absolute_get(); - rd[c].record_type = TEST_RECORD_TYPE; - rd[c].data_size = TEST_RECORD_DATALEN; - rd[c].data = GNUNET_malloc(TEST_RECORD_DATALEN); - memset ((char *) rd[c].data, TEST_RECORD_DATA, TEST_RECORD_DATALEN); + switch (success) { + case GNUNET_NO: + /* We expected GNUNET_NO, since record was not found */ + GNUNET_SCHEDULER_add_now (&end, NULL); + break; + case GNUNET_OK: + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Namestore could remove non-existing record: `%s'\n", + (NULL !=emsg) ? emsg : ""); + GNUNET_SCHEDULER_add_now (&endbadly, NULL); + break; + case GNUNET_SYSERR: + default: + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Namestore failed: `%s'\n", + (NULL !=emsg) ? emsg : ""); + GNUNET_SCHEDULER_add_now (&endbadly, NULL); + break; } - - return rd; } -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); - } - -} 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); - size_t rd_ser_len; - - /* 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); + 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, + "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); - - /* create record */ - s_name = "dummy.dummy.gnunet"; - s_rd = create_record (RECORDS); - - rd_ser_len = GNUNET_NAMESTORE_records_get_size(RECORDS, s_rd); - char rd_ser[rd_ser_len]; - GNUNET_NAMESTORE_records_serialize(RECORDS, s_rd, rd_ser_len, rd_ser); - - /* sign */ - s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_rd[0].expiration, s_name, s_rd, RECORDS); - - /* create random zone hash */ - GNUNET_CRYPTO_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone); - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Name: `%s' Zone: `%s' \n", s_name, GNUNET_h2s_full(&s_zone)); - - - start_arm (cfgfile); - GNUNET_assert (arm != NULL); + GNUNET_CRYPTO_ecdsa_key_get_public (privkey, &pubkey); nsh = GNUNET_NAMESTORE_connect (cfg); GNUNET_break (NULL != nsh); - - GNUNET_break (s_rd != NULL); - GNUNET_break (s_name != NULL); - - GNUNET_NAMESTORE_record_put (nsh, &pubkey, s_name, - GNUNET_TIME_UNIT_FOREVER_ABS, - RECORDS, s_rd, s_signature, put_cont, s_name); - - + nsqe = GNUNET_NAMESTORE_records_store (nsh, privkey, name, + 0, NULL, + &put_cont, (void *) name); + if (NULL == nsqe) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Namestore cannot store no block\n")); + } } -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 (); - GNUNET_free (s_signature); - return ret; + res = 1; + if (0 != + 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_remove_not_existing_record.c */