diff options
Diffstat (limited to 'src/namestore/test_namestore_api_zone_iteration_stop.c')
| -rw-r--r-- | src/namestore/test_namestore_api_zone_iteration_stop.c | 187 |
1 files changed, 66 insertions, 121 deletions
diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c index 9f62c73..dcb6f8c 100644 --- a/src/namestore/test_namestore_api_zone_iteration_stop.c +++ b/src/namestore/test_namestore_api_zone_iteration_stop.c @@ -23,68 +23,55 @@ */ #include "platform.h" #include "gnunet_common.h" +#include "gnunet_testing_lib.h" #include "gnunet_namestore_service.h" #include "namestore.h" -#define VERBOSE GNUNET_NO -#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15) +#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 150) static struct GNUNET_NAMESTORE_Handle * nsh; static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; + static GNUNET_SCHEDULER_TaskIdentifier stopiteration_task; -static struct GNUNET_OS_Process *arm; static struct GNUNET_CRYPTO_RsaPrivateKey * privkey; + static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey; -static GNUNET_HashCode zone; + +static struct GNUNET_HashCode zone; static struct GNUNET_CRYPTO_RsaPrivateKey * privkey2; + static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey2; -static GNUNET_HashCode zone2; + +static struct GNUNET_HashCode zone2; static struct GNUNET_NAMESTORE_ZoneIterator *zi; + static int res; + static int returned_records; -struct GNUNET_CRYPTO_RsaSignature *sig_1; -char * s_name_1; -struct GNUNET_NAMESTORE_RecordData *s_rd_1; +static struct GNUNET_CRYPTO_RsaSignature *sig_1; -struct GNUNET_CRYPTO_RsaSignature *sig_2; -char * s_name_2; -struct GNUNET_NAMESTORE_RecordData *s_rd_2; +static char * s_name_1; -struct GNUNET_CRYPTO_RsaSignature *sig_3; -char * s_name_3; -struct GNUNET_NAMESTORE_RecordData *s_rd_3; +static struct GNUNET_NAMESTORE_RecordData *s_rd_1; -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_RsaSignature *sig_2; + +static char * s_name_2; + +static struct GNUNET_NAMESTORE_RecordData *s_rd_2; + +static struct GNUNET_CRYPTO_RsaSignature *sig_3; + +static char * s_name_3; + +static struct GNUNET_NAMESTORE_RecordData *s_rd_3; -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. @@ -100,18 +87,15 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_SCHEDULER_cancel (stopiteration_task); stopiteration_task = GNUNET_SCHEDULER_NO_TASK; } - if (nsh != NULL) - GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES); + GNUNET_NAMESTORE_disconnect (nsh); nsh = NULL; - GNUNET_free_non_null(sig_1); GNUNET_free_non_null(sig_2); GNUNET_free_non_null(sig_3); GNUNET_free_non_null(s_name_1); GNUNET_free_non_null(s_name_2); GNUNET_free_non_null(s_name_3); - if (s_rd_1 != NULL) { GNUNET_free ((void *)s_rd_1->data); @@ -127,7 +111,6 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_free ((void *)s_rd_3->data); GNUNET_free (s_rd_3); } - if (privkey != NULL) GNUNET_CRYPTO_rsa_key_free (privkey); privkey = NULL; @@ -135,10 +118,6 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) if (privkey2 != NULL) GNUNET_CRYPTO_rsa_key_free (privkey2); privkey2 = NULL; - - if (NULL != arm) - stop_arm(); - res = 1; } @@ -157,11 +136,9 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_SCHEDULER_cancel (endbadly_task); endbadly_task = GNUNET_SCHEDULER_NO_TASK; } - if (privkey != NULL) GNUNET_CRYPTO_rsa_key_free (privkey); privkey = NULL; - if (privkey2 != NULL) GNUNET_CRYPTO_rsa_key_free (privkey2); privkey2 = NULL; @@ -187,13 +164,9 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_free ((void *)s_rd_3->data); GNUNET_free (s_rd_3); } - if (nsh != NULL) - GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES); + GNUNET_NAMESTORE_disconnect (nsh); nsh = NULL; - - if (NULL != arm) - stop_arm(); if (returned_records == 1) res = 0; else @@ -201,13 +174,15 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } -void zone_proc (void *cls, - const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key, - struct GNUNET_TIME_Absolute expire, - const char *name, - unsigned int rd_count, - const struct GNUNET_NAMESTORE_RecordData *rd, - const struct GNUNET_CRYPTO_RsaSignature *signature) + +static void +zone_proc (void *cls, + const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key, + struct GNUNET_TIME_Absolute expire, + const char *name, + unsigned int rd_count, + const struct GNUNET_NAMESTORE_RecordData *rd, + const struct GNUNET_CRYPTO_RsaSignature *signature) { int failed = GNUNET_NO; @@ -336,25 +311,8 @@ void zone_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) { static int c = 0; @@ -393,16 +351,17 @@ 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)); + rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData)); for (c = 0; c < count; c++) { - rd[c].expiration = GNUNET_TIME_absolute_get(); + rd[c].expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS).abs_value; rd[c].record_type = 1111; rd[c].data_size = 50; rd[c].data = GNUNET_malloc(50); @@ -411,14 +370,16 @@ create_record (int count) return rd; } + 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; + struct GNUNET_TIME_Absolute et; + + 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); @@ -437,10 +398,6 @@ run (void *cls, char *const *args, const char *cfgfile, GNUNET_CRYPTO_rsa_key_get_public(privkey2, &pubkey2); GNUNET_CRYPTO_hash(&pubkey2, sizeof (pubkey), &zone2); - - start_arm (cfgfile); - GNUNET_assert (arm != NULL); - nsh = GNUNET_NAMESTORE_connect (cfg); GNUNET_break (NULL != nsh); @@ -448,7 +405,8 @@ run (void *cls, char *const *args, const char *cfgfile, GNUNET_asprintf(&s_name_1, "dummy1"); s_rd_1 = create_record(1); - sig_1 = GNUNET_NAMESTORE_create_signature(privkey, s_rd_1[0].expiration, s_name_1, s_rd_1, 1); + et.abs_value = s_rd_1[0].expiration_time; + sig_1 = GNUNET_NAMESTORE_create_signature(privkey, et, s_name_1, s_rd_1, 1); GNUNET_NAMESTORE_record_create(nsh, privkey, s_name_1, s_rd_1, &put_cont, NULL); @@ -456,46 +414,33 @@ run (void *cls, char *const *args, const char *cfgfile, GNUNET_asprintf(&s_name_2, "dummy2"); s_rd_2 = create_record(1); - sig_2 = GNUNET_NAMESTORE_create_signature(privkey, s_rd_2[0].expiration, s_name_2, s_rd_2, 1); + et.abs_value = s_rd_2[0].expiration_time; + sig_2 = GNUNET_NAMESTORE_create_signature(privkey, et, s_name_2, s_rd_2, 1); GNUNET_NAMESTORE_record_create(nsh, privkey, s_name_2, s_rd_2, &put_cont, NULL); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 3\n"); /* name in different zone */ GNUNET_asprintf(&s_name_3, "dummy3"); s_rd_3 = create_record(1); - sig_3 = GNUNET_NAMESTORE_create_signature(privkey2, s_rd_3[0].expiration, s_name_3, s_rd_3, 1); + et.abs_value = s_rd_3[0].expiration_time; + sig_3 = GNUNET_NAMESTORE_create_signature(privkey2, et, s_name_3, s_rd_3, 1); GNUNET_NAMESTORE_record_put (nsh, &pubkey2, s_name_3, GNUNET_TIME_UNIT_FOREVER_ABS, 1, s_rd_3, sig_3, &put_cont, NULL); } -static int -check () -{ - static char *const argv[] = { "test_namestore_api_zone_iteration", - "-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_zone_iteration", - "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-zone-iteration-stop", + "namestore", + "test_namestore_api.conf", + &run, + NULL)) + return 1; + return res; } -/* end of test_namestore_api_zone_iteration.c */ + +/* end of test_namestore_api_zone_iteration_stop.c */ |