X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamestore%2Ftest_namestore_api_zone_iteration_specific_zone.c;h=cbcd94cd52922de684370143b9ed1a73bfca3212;hb=c60e83d3939da9f4e368c13ba3d2ea950b6c28d1;hp=a4fb320e914656e563a49034be331cf4540c235b;hpb=a5e3e870f27c8ef3a3cd5d59a686a3050f9c64fb;p=oweals%2Fgnunet.git diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c index a4fb320e9..cbcd94cd5 100644 --- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c +++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c @@ -2,20 +2,20 @@ This file is part of GNUnet. 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 - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . - 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + SPDX-License-Identifier: AGPL3.0-or-later */ /** * @file namestore/test_namestore_api_zone_iteration_specific_zone.c @@ -26,6 +26,9 @@ #include "gnunet_namestore_service.h" #include "gnunet_testing_lib.h" #include "namestore.h" +#include "gnunet_dnsparser_lib.h" + +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100) @@ -57,53 +60,17 @@ static char * s_name_3; static struct GNUNET_GNSRECORD_Data *s_rd_3; -static char *directory; /** - * Re-establish the connection to the service. + * Handle timeout. * * @param cls handle to use to re-connect. - * @param tc scheduler context */ static void endbadly (void *cls) { - if (NULL != zi) - { - GNUNET_NAMESTORE_zone_iteration_stop (zi); - zi = NULL; - } - if (nsh != NULL) - GNUNET_NAMESTORE_disconnect (nsh); - nsh = NULL; - - 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); - GNUNET_free (s_rd_1); - } - if (s_rd_2 != NULL) - { - GNUNET_free ((void *)s_rd_2->data); - GNUNET_free (s_rd_2); - } - if (s_rd_3 != NULL) - { - GNUNET_free ((void *)s_rd_3->data); - GNUNET_free (s_rd_3); - } - - if (privkey != NULL) - GNUNET_free (privkey); - privkey = NULL; - - if (privkey2 != NULL) - GNUNET_free (privkey2); - privkey2 = NULL; + endbadly_task = NULL; + GNUNET_SCHEDULER_shutdown (); res = 1; } @@ -116,24 +83,24 @@ end (void *cls) GNUNET_NAMESTORE_zone_iteration_stop (zi); zi = NULL; } - - if (endbadly_task != NULL) + if (NULL != endbadly_task) { GNUNET_SCHEDULER_cancel (endbadly_task); endbadly_task = NULL; } - - if (privkey != NULL) + if (NULL != privkey) + { GNUNET_free (privkey); - privkey = NULL; - - if (privkey2 != NULL) + privkey = NULL; + } + if (NULL != privkey2) + { GNUNET_free (privkey2); - privkey2 = NULL; - - GNUNET_free (s_name_1); - GNUNET_free (s_name_2); - GNUNET_free (s_name_3); + privkey2 = NULL; + } + 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); @@ -150,8 +117,10 @@ end (void *cls) GNUNET_free (s_rd_3); } if (nsh != NULL) + { GNUNET_NAMESTORE_disconnect (nsh); - nsh = NULL; + nsh = NULL; + } } @@ -159,6 +128,7 @@ static void fail_cb (void *cls) { GNUNET_assert (0); + zi = NULL; } @@ -244,7 +214,8 @@ zone_proc (void *cls, else { GNUNET_break (0); - GNUNET_SCHEDULER_add_now (&end, NULL); + res = 2; + GNUNET_SCHEDULER_shutdown (); } } @@ -252,24 +223,28 @@ zone_proc (void *cls, static void zone_proc_end (void *cls) { + zi = NULL; GNUNET_break (2 == returned_records); if (2 == returned_records) { res = 0; /* Last iteraterator callback, we are done */ - zi = NULL; } else + { res = 1; + } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received last result, iteration done after receing %u results\n", returned_records); - GNUNET_SCHEDULER_add_now (&end, NULL); + GNUNET_SCHEDULER_shutdown (); } static void -put_cont (void *cls, int32_t success, const char *emsg) +put_cont (void *cls, + int32_t success, + const char *emsg) { static int c = 0; @@ -285,9 +260,8 @@ put_cont (void *cls, int32_t success, const char *emsg) "Failed to created records: `%s'\n", emsg); GNUNET_break (0); - if (NULL != endbadly_task) - GNUNET_SCHEDULER_cancel (endbadly_task); - endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); + res = 2; + GNUNET_SCHEDULER_shutdown (); return; } @@ -310,9 +284,8 @@ put_cont (void *cls, int32_t success, const char *emsg) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone iterator\n"); GNUNET_break (0); - if (NULL != endbadly_task) - GNUNET_SCHEDULER_cancel (endbadly_task); - endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); + res = 2; + GNUNET_SCHEDULER_shutdown (); return; } } @@ -322,14 +295,14 @@ put_cont (void *cls, int32_t success, const char *emsg) static struct GNUNET_GNSRECORD_Data * create_record (unsigned int count) { - unsigned int c; - struct GNUNET_GNSRECORD_Data * rd; + struct GNUNET_GNSRECORD_Data *rd; - rd = GNUNET_malloc (count * sizeof (struct GNUNET_GNSRECORD_Data)); - for (c = 0; c < count; c++) + rd = GNUNET_new_array (count, + struct GNUNET_GNSRECORD_Data); + for (unsigned int c = 0; c < count; c++) { rd[c].expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS).abs_value_us; - rd[c].record_type = 1111; + rd[c].record_type = TEST_RECORD_TYPE; rd[c].data_size = 50; rd[c].data = GNUNET_malloc(50); rd[c].flags = 0; @@ -357,9 +330,8 @@ empty_zone_proc (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Expected empty zone but received zone private key\n")); GNUNET_break (0); - if (endbadly_task != NULL) - GNUNET_SCHEDULER_cancel (endbadly_task); - endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); + res = 2; + GNUNET_SCHEDULER_shutdown (); return; } if ((NULL != label) || (NULL != rd) || (0 != rd_count)) @@ -367,9 +339,8 @@ empty_zone_proc (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Expected no zone content but received data\n")); GNUNET_break (0); - if (endbadly_task != NULL) - GNUNET_SCHEDULER_cancel (endbadly_task); - endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); + res = 2; + GNUNET_SCHEDULER_shutdown (); return; } GNUNET_assert (0); @@ -379,35 +350,16 @@ empty_zone_proc (void *cls, static void empty_zone_proc_end (void *cls) { - char *hostkey_file; - zi = 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); + privkey = GNUNET_CRYPTO_ecdsa_key_create (); GNUNET_assert (privkey != NULL); - - GNUNET_asprintf(&hostkey_file, - "zonefiles%s%s", - DIR_SEPARATOR_STR, - "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Using zonekey file `%s' \n", - hostkey_file); - privkey2 = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file); - GNUNET_free (hostkey_file); + privkey2 = GNUNET_CRYPTO_ecdsa_key_create (); GNUNET_assert (privkey2 != NULL); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 1\n"); - - GNUNET_asprintf(&s_name_1, "dummy1"); + GNUNET_asprintf (&s_name_1, + "dummy1"); s_rd_1 = create_record (1); GNUNET_NAMESTORE_records_store (nsh, privkey, @@ -419,7 +371,8 @@ empty_zone_proc_end (void *cls) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 2 \n"); - GNUNET_asprintf(&s_name_2, "dummy2"); + GNUNET_asprintf (&s_name_2, + "dummy2"); s_rd_2 = create_record (1); GNUNET_NAMESTORE_records_store (nsh, privkey, @@ -433,7 +386,8 @@ empty_zone_proc_end (void *cls) "Created record 3\n"); /* name in different zone */ - GNUNET_asprintf(&s_name_3, "dummy3"); + GNUNET_asprintf (&s_name_3, + "dummy3"); s_rd_3 = create_record (1); GNUNET_NAMESTORE_records_store (nsh, privkey2, @@ -449,14 +403,8 @@ run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg, struct GNUNET_TESTING_Peer *peer) { - directory = NULL; - GNUNET_assert (GNUNET_OK == - GNUNET_CONFIGURATION_get_value_string (cfg, - "PATHS", - "GNUNET_TEST_HOME", - &directory)); - GNUNET_DISK_directory_remove (directory); - + GNUNET_SCHEDULER_add_shutdown (&end, + NULL); endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &endbadly, NULL); @@ -476,22 +424,21 @@ run (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone iterator\n"); GNUNET_break (0); - GNUNET_SCHEDULER_cancel (endbadly_task); - endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); + GNUNET_SCHEDULER_shutdown (); } } +#include "test_common.c" + + int main (int argc, char *argv[]) { const char *plugin_name; char *cfg_name; - plugin_name = GNUNET_TESTING_get_testname_from_underscore (argv[0]); - GNUNET_asprintf (&cfg_name, - "test_namestore_api_%s.conf", - plugin_name); + SETUP_CFG (plugin_name, cfg_name); res = 1; if (0 != GNUNET_TESTING_peer_run ("test-namestore-api-zone-iteration-specific-zone", @@ -501,12 +448,9 @@ main (int argc, char *argv[]) { res = 1; } + GNUNET_DISK_purge_cfg_dir (cfg_name, + "GNUNET_TEST_HOME"); GNUNET_free (cfg_name); - if (NULL != directory) - { - GNUNET_DISK_directory_remove (directory); - GNUNET_free (directory); - } return res; }