-fix #3301

[oweals/gnunet.git] / src / namestore / test_namestore_api_zone_iteration_stop.c

diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c
index 7b6824727ed401a0dcc959b40795ae035a5dd9ef..adfd234c63c84369692ad08a69ffba0c531effd4 100644 (file)
--- a/src/namestore/test_namestore_api_zone_iteration_stop.c
+++ b/src/namestore/test_namestore_api_zone_iteration_stop.c
@@ -46,15 +46,17 @@ static int returned_records;
 
 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 char *directory;
 
 
 /**
@@ -110,11 +112,11 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 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)
   {
@@ -156,10 +158,10 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 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))
@@ -184,7 +186,7 @@ zone_proc (void *cls,
       {
         if (rd_count == 1)
         {
-          if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_1))
+          if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_1))
           {
             failed = GNUNET_YES;
             GNUNET_break (0);
@@ -200,7 +202,7 @@ zone_proc (void *cls,
       {
         if (rd_count == 1)
         {
-          if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_2))
+          if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_2))
           {
             failed = GNUNET_YES;
             GNUNET_break (0);
@@ -228,7 +230,7 @@ zone_proc (void *cls,
       {
         if (rd_count == 1)
         {
-          if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_3))
+          if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_3))
           {
             failed = GNUNET_YES;
             GNUNET_break (0);
@@ -331,19 +333,20 @@ put_cont (void *cls, int32_t success, const char *emsg)
 }
 
 
-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;
@@ -360,7 +363,7 @@ empty_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_GNSRECORD_Data *rd)
 {
   char *hostkey_file;
 
@@ -430,6 +433,10 @@ run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *cfg,
      struct GNUNET_TESTING_Peer *peer)
 {
+  directory = NULL;
+  GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory);
+  GNUNET_DISK_directory_remove (directory);
+
   endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT, &endbadly, NULL);
   nsh = GNUNET_NAMESTORE_connect (cfg);
   GNUNET_break (NULL != nsh);
@@ -449,15 +456,20 @@ run (void *cls,
 int
 main (int argc, char *argv[])
 {
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-namestore/");
   res = 1;
   if (0 !=
-      GNUNET_TESTING_service_run ("test-namestore-api-zone-iteration-stop",
-                                 "namestore",
-                                 "test_namestore_api.conf",
-                                 &run,
-                                 NULL))
-    return 1;
+      GNUNET_TESTING_peer_run ("test-namestore-api-zone-iteration-stop",
+                               "test_namestore_api.conf",
+                               &run,
+                               NULL))
+  {
+    res = 1;
+  }
+  if (NULL != directory)
+  {
+      GNUNET_DISK_directory_remove (directory);
+      GNUNET_free (directory);
+  }
   return res;
 }