X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamestore%2Ftest_namestore_api_put.c;h=3cf1b465b3addb3e897ac2713e28516e7f9d2201;hb=0f8f8219d92f8f000aa662aa6beb3749f71f3486;hp=9315fd3b5983162596453f4a9112b6287df66769;hpb=46a63dc665f31fa7d42639ab6adabbdb1af239c8;p=oweals%2Fgnunet.git diff --git a/src/namestore/test_namestore_api_put.c b/src/namestore/test_namestore_api_put.c index 9315fd3b5..3cf1b465b 100644 --- a/src/namestore/test_namestore_api_put.c +++ b/src/namestore/test_namestore_api_put.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2009 Christian Grothoff (and other contributing authors) + (C) 2009, 2012 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 @@ -24,54 +24,32 @@ #include "platform.h" #include "gnunet_common.h" #include "gnunet_namestore_service.h" +#include "gnunet_testing_lib-new.h" #include "namestore.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_CRYPTO_RsaPrivateKey * privkey; + static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey; -struct GNUNET_NAMESTORE_RecordData *s_rd; +static struct GNUNET_NAMESTORE_RecordData *s_rd; 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 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_destroy (arm); - arm = NULL; - } -} /** * Re-establish the connection to the service. @@ -83,15 +61,15 @@ 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); - privkey = NULL; - - if (NULL != arm) - stop_arm(); + privkey = NULL; + } + GNUNET_SCHEDULER_shutdown (); res = 1; } @@ -106,144 +84,103 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } if (privkey != NULL) + { GNUNET_CRYPTO_rsa_key_free (privkey); - privkey = NULL; - + privkey = NULL; + } if (nsh != NULL) - GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES); - nsh = NULL; - - if (NULL != arm) - stop_arm(); + { + GNUNET_NAMESTORE_disconnect (nsh); + nsh = NULL; + } } -void + +static void put_cont (void *cls, int32_t success, const char *emsg) { - char * name = cls; + const 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" : "FAIL"); if (success == GNUNET_OK) res = 0; else res = 1; - - GNUNET_SCHEDULER_add_now(&end, NULL); + GNUNET_SCHEDULER_add_now (&end, NULL); } + 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; + 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); + struct GNUNET_CRYPTO_RsaSignature *signature; + const char * s_name = "dummy.dummy.gnunet"; + int c; + char *hostkey_file; + struct GNUNET_TIME_Absolute et; + endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL); /* 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); + GNUNET_free (hostkey_file); /* get public key */ GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey); - - struct GNUNET_CRYPTO_RsaSignature *signature; - - start_arm (cfgfile); - GNUNET_assert (arm != NULL); - nsh = GNUNET_NAMESTORE_connect (cfg); GNUNET_break (NULL != nsh); - /* create record */ - char * s_name = "dummy.dummy.gnunet"; s_rd = create_record (RECORDS); - - signature = GNUNET_NAMESTORE_create_signature(privkey, s_rd[0].expiration, s_name, s_rd, RECORDS); - + et.abs_value = s_rd[0].expiration_time; + signature = GNUNET_NAMESTORE_create_signature(privkey, et, s_name, s_rd, RECORDS); 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, signature, put_cont, s_name); - + GNUNET_TIME_UNIT_FOREVER_ABS, + RECORDS, s_rd, signature, &put_cont, (void*) s_name); GNUNET_free (signature); - - int c; for (c = 0; c < RECORDS; c++) GNUNET_free_non_null((void *) s_rd[c].data); GNUNET_free (s_rd); - } -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_service_run ("test-namestore-api-put", + "namestore", + "test_namestore_api.conf", + &run, + NULL)) + return 1; + return res; } -/* end of test_namestore_api.c */ +/* end of test_namestore_api_put.c */