-check NULL, check RV

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

diff --git a/src/namestore/test_namestore_api_monitoring.c b/src/namestore/test_namestore_api_monitoring.c
index 79474e67e9cedb48b8b26350304ae459ff881d40..c2fe450ce59c81fdfc66baf780f2fffe487dda15 100644 (file)
--- a/src/namestore/test_namestore_api_monitoring.c
+++ b/src/namestore/test_namestore_api_monitoring.c
@@ -22,7 +22,6 @@
  * @brief testcase for zone monitoring functionality: monitor first, then add records
  */
 #include "platform.h"
-#include "gnunet_common.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 #include "namestore.h"
@@ -35,9 +34,9 @@ static struct GNUNET_NAMESTORE_Handle * nsh;
 
 static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
-static struct GNUNET_CRYPTO_EccPrivateKey * privkey;
+static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey;
 
-static struct GNUNET_CRYPTO_EccPrivateKey * privkey2;
+static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey2;
 
 static struct GNUNET_NAMESTORE_ZoneMonitor *zm;
 
@@ -45,18 +44,19 @@ static int res;
 
 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 ()
@@ -146,18 +146,20 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static void
 zone_proc (void *cls,
-          const struct GNUNET_CRYPTO_EccPrivateKey *zone_key,
+          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", 
+             "Comparing results name %s\n",
              name);
-
-  if (0 != memcmp (zone_key, privkey, sizeof (struct GNUNET_CRYPTO_EccPrivateKey)))
+  if (0 != memcmp (zone_key,
+                   privkey,
+                   sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Monitoring returned wrong zone key\n");
@@ -169,7 +171,7 @@ zone_proc (void *cls,
 
   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;
@@ -177,7 +179,7 @@ zone_proc (void *cls,
   }
   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;
@@ -186,13 +188,14 @@ zone_proc (void *cls,
   else
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-             "Invalid name %s\n",  name);
-       GNUNET_break (0);
+             "Invalid name %s\n",
+                name);
+    GNUNET_break (0);
     fail = GNUNET_YES;
   }
 
   if (2 == ++returned_records)
-  {  
+  {
     if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
     {
       GNUNET_SCHEDULER_cancel (endbadly_task);
@@ -203,7 +206,6 @@ zone_proc (void *cls,
     else
        GNUNET_SCHEDULER_add_now (&end, NULL);
   }
-
 }
 
 
@@ -223,11 +225,15 @@ put_cont (void *cls, int32_t success, const char *emsg)
   if (success == GNUNET_OK)
   {
     c++;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record %u: `%s'\n", c, label);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Created record %u: `%s'\n",
+                c,
+                label);
   }
   else
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to created records\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to created records\n");
     GNUNET_break (0);
     GNUNET_SCHEDULER_cancel (endbadly_task);
     endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
@@ -235,19 +241,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;
@@ -255,7 +262,7 @@ create_record (unsigned int count)
 
 
 static void
-run (void *cls, 
+run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *cfg,
      struct GNUNET_TESTING_Peer *peer)
 {
@@ -263,25 +270,31 @@ run (void *cls,
 
   res = 1;
 
+  directory = NULL;
+  GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory);
+  GNUNET_DISK_directory_remove (directory);
+
   GNUNET_asprintf(&hostkey_file,
                  "zonefiles%s%s",
                  DIR_SEPARATOR_STR,
                  "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Using zonekey file `%s' \n", hostkey_file);
-  privkey = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file);
+  privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
   GNUNET_free (hostkey_file);
   GNUNET_assert (privkey != NULL);
 
   /* Start monitoring */
   zm = GNUNET_NAMESTORE_zone_monitor_start (cfg,
-                                               privkey,
+                                            privkey,
+                                            GNUNET_YES,
                                            &zone_proc,
                                            NULL,
                                            NULL);
   if (NULL == zm)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone monitor\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to create zone monitor\n");
     GNUNET_break (0);
     endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
     return;
@@ -302,7 +315,7 @@ run (void *cls,
                  DIR_SEPARATOR_STR,
                  "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey");
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
-  privkey2 = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file);
+  privkey2 = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
   GNUNET_free (hostkey_file);
   GNUNET_assert (privkey2 != NULL);
 
@@ -335,13 +348,19 @@ int
 main (int argc, char *argv[])
 {
   res = 1;
-  if (0 != 
-      GNUNET_TESTING_service_run ("test-namestore-api-monitoring",
-                                 "namestore",
-                                 "test_namestore_api.conf",
-                                 &run,
-                                 NULL))
-    return 1;
+  if (0 !=
+      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;
 }