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 | 52 |
1 files changed, 23 insertions, 29 deletions
diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c index c7be5fead..eb7ad4305 100644 --- a/src/namestore/test_namestore_api_zone_iteration_stop.c +++ b/src/namestore/test_namestore_api_zone_iteration_stop.c | |||
@@ -2,20 +2,18 @@ | |||
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | Copyright (C) 2009 GNUnet e.V. | 3 | Copyright (C) 2009 GNUnet e.V. |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software: you can redistribute it and/or modify it |
6 | it under the terms of the GNU General Public License as published | 6 | under the terms of the GNU Affero General Public License as published |
7 | by the Free Software Foundation; either version 3, or (at your | 7 | by the Free Software Foundation, either version 3 of the License, |
8 | option) any later version. | 8 | or (at your option) any later version. |
9 | 9 | ||
10 | GNUnet is distributed in the hope that it will be useful, but | 10 | GNUnet is distributed in the hope that it will be useful, but |
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | General Public License for more details. | 13 | Affero General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU Affero General Public License |
16 | along with GNUnet; see the file COPYING. If not, write to the | 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
18 | Boston, MA 02110-1301, USA. | ||
19 | */ | 17 | */ |
20 | /** | 18 | /** |
21 | * @file namestore/test_namestore_api_zone_iteration.c | 19 | * @file namestore/test_namestore_api_zone_iteration.c |
@@ -25,7 +23,9 @@ | |||
25 | #include "gnunet_namestore_service.h" | 23 | #include "gnunet_namestore_service.h" |
26 | #include "gnunet_testing_lib.h" | 24 | #include "gnunet_testing_lib.h" |
27 | #include "namestore.h" | 25 | #include "namestore.h" |
26 | #include "gnunet_dnsparser_lib.h" | ||
28 | 27 | ||
28 | #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT | ||
29 | 29 | ||
30 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100) | 30 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100) |
31 | #define WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2) | 31 | #define WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2) |
@@ -56,7 +56,6 @@ static char * s_name_3; | |||
56 | 56 | ||
57 | static struct GNUNET_GNSRECORD_Data *s_rd_3; | 57 | static struct GNUNET_GNSRECORD_Data *s_rd_3; |
58 | 58 | ||
59 | static char *directory; | ||
60 | 59 | ||
61 | 60 | ||
62 | /** | 61 | /** |
@@ -350,14 +349,14 @@ put_cont (void *cls, int32_t success, const char *emsg) | |||
350 | static struct GNUNET_GNSRECORD_Data * | 349 | static struct GNUNET_GNSRECORD_Data * |
351 | create_record (unsigned int count) | 350 | create_record (unsigned int count) |
352 | { | 351 | { |
353 | unsigned int c; | 352 | struct GNUNET_GNSRECORD_Data *rd; |
354 | struct GNUNET_GNSRECORD_Data * rd; | ||
355 | 353 | ||
356 | rd = GNUNET_malloc (count * sizeof (struct GNUNET_GNSRECORD_Data)); | 354 | rd = GNUNET_new_array (count, |
357 | for (c = 0; c < count; c++) | 355 | struct GNUNET_GNSRECORD_Data); |
356 | for (unsigned int c = 0; c < count; c++) | ||
358 | { | 357 | { |
359 | rd[c].expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS).abs_value_us; | 358 | rd[c].expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS).abs_value_us; |
360 | rd[c].record_type = 1111; | 359 | rd[c].record_type = TEST_RECORD_TYPE; |
361 | rd[c].data_size = 50; | 360 | rd[c].data_size = 50; |
362 | rd[c].data = GNUNET_malloc(50); | 361 | rd[c].data = GNUNET_malloc(50); |
363 | rd[c].flags = 0; | 362 | rd[c].flags = 0; |
@@ -475,14 +474,9 @@ run (void *cls, | |||
475 | const struct GNUNET_CONFIGURATION_Handle *cfg, | 474 | const struct GNUNET_CONFIGURATION_Handle *cfg, |
476 | struct GNUNET_TESTING_Peer *peer) | 475 | struct GNUNET_TESTING_Peer *peer) |
477 | { | 476 | { |
478 | GNUNET_assert (GNUNET_OK == | 477 | endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, |
479 | GNUNET_CONFIGURATION_get_value_string (cfg, | 478 | &endbadly, |
480 | "PATHS", | 479 | NULL); |
481 | "GNUNET_TEST_HOME", | ||
482 | &directory)); | ||
483 | GNUNET_DISK_directory_remove (directory); | ||
484 | |||
485 | endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &endbadly, NULL); | ||
486 | nsh = GNUNET_NAMESTORE_connect (cfg); | 480 | nsh = GNUNET_NAMESTORE_connect (cfg); |
487 | GNUNET_break (NULL != nsh); | 481 | GNUNET_break (NULL != nsh); |
488 | /* first, iterate over empty namestore */ | 482 | /* first, iterate over empty namestore */ |
@@ -515,6 +509,8 @@ main (int argc, char *argv[]) | |||
515 | GNUNET_asprintf (&cfg_name, | 509 | GNUNET_asprintf (&cfg_name, |
516 | "test_namestore_api_%s.conf", | 510 | "test_namestore_api_%s.conf", |
517 | plugin_name); | 511 | plugin_name); |
512 | GNUNET_DISK_purge_cfg_dir (cfg_name, | ||
513 | "GNUNET_TEST_HOME"); | ||
518 | res = 1; | 514 | res = 1; |
519 | if (0 != | 515 | if (0 != |
520 | GNUNET_TESTING_peer_run ("test-namestore-api-zone-iteration-stop", | 516 | GNUNET_TESTING_peer_run ("test-namestore-api-zone-iteration-stop", |
@@ -524,12 +520,10 @@ main (int argc, char *argv[]) | |||
524 | { | 520 | { |
525 | res = 1; | 521 | res = 1; |
526 | } | 522 | } |
523 | GNUNET_DISK_purge_cfg_dir (cfg_name, | ||
524 | "GNUNET_TEST_HOME"); | ||
527 | GNUNET_free (cfg_name); | 525 | GNUNET_free (cfg_name); |
528 | if (NULL != directory) | 526 | |
529 | { | ||
530 | GNUNET_DISK_directory_remove (directory); | ||
531 | GNUNET_free (directory); | ||
532 | } | ||
533 | return res; | 527 | return res; |
534 | } | 528 | } |
535 | 529 | ||