/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ (C) 2013 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
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;
/**
static void
endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (NULL != zi)
- {
- GNUNET_NAMESTORE_zone_iteration_stop (zi);
- zi = NULL;
- }
-
+ if (NULL != zi)
+ {
+ GNUNET_NAMESTORE_zone_iteration_stop (zi);
+ zi = NULL;
+ }
if (nsh != NULL)
+ {
GNUNET_NAMESTORE_disconnect (nsh);
- nsh = NULL;
-
+ nsh = NULL;
+ }
GNUNET_free_non_null(s_name_1);
GNUNET_free_non_null(s_name_2);
GNUNET_free_non_null(s_name_3);
static void
end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (NULL != zi)
- {
- GNUNET_NAMESTORE_zone_iteration_stop (zi);
- zi = NULL;
- }
-
+ if (NULL != zi)
+ {
+ GNUNET_NAMESTORE_zone_iteration_stop (zi);
+ zi = NULL;
+ }
if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (endbadly_task);
static void
zone_proc (void *cls,
- const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
- const char *label,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+ const char *label,
+ unsigned int rd_count,
+ const struct GNUNET_GNSRECORD_Data *rd)
{
int failed = GNUNET_NO;
+
if ((zone == NULL) && (label == NULL))
{
GNUNET_break (3 == returned_records);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received last result, iteration done after receing %u results\n",
- returned_records );
+ returned_records);
GNUNET_SCHEDULER_add_now (&end, NULL);
return;
}
- else
+ if (0 == memcmp (zone, privkey, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
{
- if (0 == memcmp (zone, privkey, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
- {
- if (0 == strcmp (label, s_name_1))
+ if (0 == strcmp (label, s_name_1))
+ {
+ if (rd_count == 1)
{
- if (rd_count == 1)
- {
- if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_1))
- {
- failed = GNUNET_YES;
- GNUNET_break (0);
- }
- }
- else
+ if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_1))
{
failed = GNUNET_YES;
GNUNET_break (0);
}
}
- else if (0 == strcmp (label, s_name_2))
+ else
{
- if (rd_count == 1)
- {
- if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_2))
- {
- failed = GNUNET_YES;
- GNUNET_break (0);
- }
- }
- else
+ failed = GNUNET_YES;
+ GNUNET_break (0);
+ }
+ }
+ else if (0 == strcmp (label, s_name_2))
+ {
+ if (rd_count == 1)
+ {
+ if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_2))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Received invalid record count\n");
failed = GNUNET_YES;
GNUNET_break (0);
}
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Comparing result failed: got name `%s' for first zone\n", label);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Received invalid record count\n");
failed = GNUNET_YES;
GNUNET_break (0);
}
- }
- else if (0 == memcmp (zone, privkey2, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
- {
- if (0 == strcmp (label, s_name_3))
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Comparing result failed: got name `%s' for first zone\n", label);
+ failed = GNUNET_YES;
+ GNUNET_break (0);
+ }
+ }
+ else if (0 == memcmp (zone, privkey2, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
+ {
+ if (0 == strcmp (label, s_name_3))
+ {
+ if (rd_count == 1)
{
- if (rd_count == 1)
+ if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_3))
{
- if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_3))
- {
- failed = GNUNET_YES;
- GNUNET_break (0);
- }
- }
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Received invalid record count\n");
failed = GNUNET_YES;
GNUNET_break (0);
}
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Comparing result failed: got name `%s' for first zone\n", label);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Received invalid record count\n");
failed = GNUNET_YES;
GNUNET_break (0);
}
- }
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Received invalid zone\n");
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Comparing result failed: got name `%s' for first zone\n", label);
failed = GNUNET_YES;
GNUNET_break (0);
- }
+ }
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Received invalid zone\n");
+ failed = GNUNET_YES;
+ GNUNET_break (0);
}
if (failed == GNUNET_NO)
res = 1;
returned_records = 0;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All records created, starting iteration over all zones \n");
- zi = GNUNET_NAMESTORE_zone_iteration_start(nsh,
- NULL,
- &zone_proc,
- NULL);
+ zi = GNUNET_NAMESTORE_zone_iteration_start (nsh,
+ NULL,
+ &zone_proc,
+ NULL);
if (zi == NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone iterator\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;
const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
const char *label,
unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+ const struct GNUNET_GNSRECORD_Data *rd)
{
char *hostkey_file;
GNUNET_asprintf(&s_name_1, "dummy1");
s_rd_1 = create_record(1);
- GNUNET_NAMESTORE_records_store(nsh, privkey, s_name_1,
- 1, s_rd_1, &put_cont, NULL);
+ GNUNET_NAMESTORE_records_store (nsh, privkey, s_name_1,
+ 1, s_rd_1,
+ &put_cont, NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 2 \n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Created record 2 \n");
GNUNET_asprintf(&s_name_2, "dummy2");
s_rd_2 = create_record(1);
- GNUNET_NAMESTORE_records_store(nsh, privkey, s_name_2,
- 1, s_rd_2, &put_cont, NULL);
+ GNUNET_NAMESTORE_records_store (nsh, privkey, s_name_2,
+ 1, s_rd_2, &put_cont, NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 3\n");
+ 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);
- GNUNET_NAMESTORE_records_store(nsh, privkey2, s_name_3,
- 1, s_rd_3, &put_cont, NULL);
+ GNUNET_NAMESTORE_records_store (nsh, privkey2, s_name_3,
+ 1, s_rd_3,
+ &put_cont, NULL);
}
main (int argc, char *argv[])
{
res = 1;
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunet-namestore");
if (0 !=
- GNUNET_TESTING_service_run ("test-namestore-api-zone-iteration",
- "namestore",
- "test_namestore_api.conf",
- &run,
- NULL))
+ GNUNET_TESTING_peer_run ("test-namestore-api-zone-iteration",
+ "test_namestore_api.conf",
+ &run,
+ NULL))
return 1;
return res;
}
projects / oweals / gnunet.git / blobdiff