/*
This file is part of GNUnet.
- (C) 2013 Christian Grothoff (and other contributing authors)
+ 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
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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file namestore/test_namestore_api_monitoring.c
static struct GNUNET_NAMESTORE_Handle * nsh;
-static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
+static struct GNUNET_SCHEDULER_Task * endbadly_task;
static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey;
static char * s_name_1;
-static struct GNUNET_NAMESTORE_RecordData *s_rd_1;
+static struct GNUNET_GNSRECORD_Data *s_rd_1;
static char * s_name_2;
-static struct GNUNET_NAMESTORE_RecordData *s_rd_2;
+static struct GNUNET_GNSRECORD_Data *s_rd_2;
static char * s_name_3;
-static struct GNUNET_NAMESTORE_RecordData *s_rd_3;
+static struct GNUNET_GNSRECORD_Data *s_rd_3;
struct GNUNET_NAMESTORE_QueueEntry * ns_ops[3];
+static char *directory;
static void
do_shutdown ()
* Re-establish the connection to the service.
*
* @param cls handle to use to re-connect.
- * @param tc scheduler context
*/
static void
-endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+endbadly (void *cls)
{
do_shutdown ();
res = 1;
static void
-end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end (void *cls)
{
do_shutdown ();
res = 0;
const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
const char *name,
unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+ const struct GNUNET_GNSRECORD_Data *rd)
{
- static int returned_records;
- static int fail = GNUNET_NO;
+ static int returned_records;
+ static int fail = GNUNET_NO;
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Comparing results name %s\n",
name);
if (0 == strcmp (name, s_name_1))
{
- if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_1))
+ if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_1))
{
GNUNET_break (0);
fail = GNUNET_YES;
}
else if (0 == strcmp (name, s_name_2))
{
- if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_2))
+ if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_2))
{
GNUNET_break (0);
fail = GNUNET_YES;
if (2 == ++returned_records)
{
- if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
+ if (endbadly_task != NULL)
{
GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task = GNUNET_SCHEDULER_NO_TASK;
+ endbadly_task = NULL;
}
if (GNUNET_YES == fail)
GNUNET_SCHEDULER_add_now (&endbadly, NULL);
{
/* Start monitoring */
zm = GNUNET_NAMESTORE_zone_monitor_start (cfg,
- privkey,
- &zone_proc,
- NULL,
- NULL);
+ privkey,
+ GNUNET_YES,
+ &zone_proc,
+ NULL,
+ NULL);
if (NULL == zm)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone monitor\n");
}
-static struct GNUNET_NAMESTORE_RecordData *
+static struct GNUNET_GNSRECORD_Data *
create_record (unsigned int count)
{
unsigned int c;
- struct GNUNET_NAMESTORE_RecordData * rd;
+ struct GNUNET_GNSRECORD_Data * rd;
- rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData));
+ rd = GNUNET_malloc (count * sizeof (struct GNUNET_GNSRECORD_Data));
for (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].data_size = 50;
rd[c].data = GNUNET_malloc(50);
+ rd[c].flags = 0;
memset ((char *) rd[c].data, 'a', 50);
}
return rd;
{
char *hostkey_file;
+ directory = NULL;
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string(mycfg, "PATHS", "GNUNET_TEST_HOME", &directory));
+ GNUNET_DISK_directory_remove (directory);
+
res = 1;
GNUNET_asprintf(&hostkey_file,
{
res = 1;
if (0 !=
- GNUNET_TESTING_service_run ("test-namestore-api-monitoring",
- "namestore",
- "test_namestore_api.conf",
- &run,
- NULL))
- return 1;
+ GNUNET_TESTING_peer_run ("test-namestore-api-monitoring",
+ "test_namestore_api.conf",
+ &run,
+ NULL))
+ {
+ res = 1;
+ }
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
return res;
}