X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamestore%2Ftest_namestore_api_remove_not_existing_record.c;h=9e0b22ea51dc32fc5eab8e50d560f485e7e57e60;hb=dc40d894157a9eeee4c72f8cb974fd48e1a98a1b;hp=4ee633598a6c3fba19210ee119e5e538af4b2abf;hpb=e892ec3a25fc315d58ae7aafbd138b79aff2ca34;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 4ee633598..9e0b22ea5 100644 --- a/src/namestore/test_namestore_api_remove_not_existing_record.c +++ b/src/namestore/test_namestore_api_remove_not_existing_record.c @@ -18,69 +18,51 @@ Boston, MA 02111-1307, 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 "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 TEST_REMOVE_RECORD_TYPE 4321 + #define TEST_REMOVE_RECORD_DATALEN 255 + #define TEST_REMOVE_RECORD_DATA 'b' -#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_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_CRYPTO_EccPrivateKey * privkey; +static struct GNUNET_CRYPTO_EccPublicKey pubkey; +static struct GNUNET_CRYPTO_EccSignature *s_signature; -static int res; +static struct GNUNET_HashCode s_zone; -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_RecordData *s_rd; + +static char *s_name; + +static int res; -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; - } -} /** * Re-establish the connection to the service. @@ -92,16 +74,12 @@ 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(); - + GNUNET_free_non_null (s_name); res = 1; } @@ -109,35 +87,34 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { + int c; + 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); + 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(); + GNUNET_free_non_null (s_name); } -void + +static 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) + if (GNUNET_OK == success) { res = 0; } @@ -149,7 +126,8 @@ remove_cont (void *cls, int32_t success, const char *emsg) GNUNET_SCHEDULER_add_now(&end, NULL); } -void + +static void put_cont (void *cls, int32_t success, const char *emsg) { char *name = cls; @@ -158,15 +136,9 @@ put_cont (void *cls, int32_t success, const char *emsg) { 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); + GNUNET_NAMESTORE_record_put_by_authority (nsh, privkey, name, + 0, NULL, + &remove_cont, name); } else { @@ -176,59 +148,49 @@ put_cont (void *cls, int32_t success, const char *emsg) } } + static struct GNUNET_NAMESTORE_RecordData * -create_record (int count) +create_record (unsigned int count) { - int c; + unsigned int c; struct GNUNET_NAMESTORE_RecordData * rd; - rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData)); - for (c = 0; c < RECORDS; c++) + rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData)); + for (c = 0; c < count; 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); + rd[c].expiration_time = GNUNET_TIME_absolute_get().abs_value_us; + 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); } - 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); + char *hostkey_file; size_t rd_ser_len; + struct GNUNET_TIME_Absolute et; + + endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL); /* load privat key */ - privkey = GNUNET_CRYPTO_rsa_key_create_from_file("hostkey"); + 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_ecc_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_ecc_key_get_public(privkey, &pubkey); /* create record */ - s_name = "dummy.dummy.gnunet"; + s_name = GNUNET_NAMESTORE_normalize_string ("DUMMY.dummy.gnunet"); s_rd = create_record (RECORDS); rd_ser_len = GNUNET_NAMESTORE_records_get_size(RECORDS, s_rd); @@ -236,59 +198,36 @@ run (void *cls, char *const *args, const char *cfgfile, GNUNET_NAMESTORE_records_serialize(RECORDS, s_rd, rd_ser_len, rd_ser); /* sign */ - s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_name, s_rd, RECORDS); + et.abs_value_us = s_rd[0].expiration_time; + s_signature = GNUNET_NAMESTORE_create_signature(privkey, et, s_name, s_rd, RECORDS); /* create random zone hash */ - GNUNET_CRYPTO_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone); + GNUNET_CRYPTO_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EccPublicKey), &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); - 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_absolute_get_forever(), + GNUNET_TIME_UNIT_FOREVER_ABS, RECORDS, s_rd, s_signature, put_cont, s_name); - - } -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_service_run ("test-namestore-api-remove-not-existing-record", + "namestore", + "test_namestore_api.conf", + &run, + NULL)) + return 1; + GNUNET_free_non_null (s_signature); + return res; } -/* end of test_namestore_api.c */ +/* end of test_namestore_api_remove_not_existing_record.c */