-fix leaks

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

diff --git a/src/namestore/test_namestore_api_put.c b/src/namestore/test_namestore_api_put.c
index 438c49243e956c49ac41caaec86e31f7d4dd784c..4f06283c1b43641e107a45c27c85e05f9c7a282b 100644 (file)
--- a/src/namestore/test_namestore_api_put.c
+++ b/src/namestore/test_namestore_api_put.c
@@ -22,9 +22,8 @@
  * @brief testcase for namestore_api.c
  */
 #include "platform.h"
-#include "gnunet_common.h"
 #include "gnunet_namestore_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
 #include "namestore.h"
 
 #define RECORDS 5
@@ -35,18 +34,18 @@
 
 #define TEST_RECORD_DATA 'a'
 
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100)
 
 
 static struct GNUNET_NAMESTORE_Handle * nsh;
 
 static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
-static struct GNUNET_CRYPTO_RsaPrivateKey * privkey;
+static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey;
 
-static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey;
+static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
 
-static struct GNUNET_NAMESTORE_RecordData *s_rd;
+static struct GNUNET_GNSRECORD_Data *s_rd;
 
 static int res;
 
@@ -61,12 +60,12 @@ static void
 endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   if (nsh != NULL)
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
   nsh = NULL;
 
   if (privkey != NULL)
   {
-    GNUNET_CRYPTO_rsa_key_free (privkey);
+    GNUNET_free (privkey);
     privkey = NULL;
   }
   GNUNET_SCHEDULER_shutdown ();
@@ -85,12 +84,12 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   if (privkey != NULL)
   {
-    GNUNET_CRYPTO_rsa_key_free (privkey);
+    GNUNET_free (privkey);
     privkey = NULL;
   }
   if (nsh != NULL)
   {
-    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+    GNUNET_NAMESTORE_disconnect (nsh);
     nsh = NULL;
   }
 }
@@ -101,8 +100,8 @@ put_cont (void *cls, int32_t success, const char *emsg)
 {
   const char * name = cls;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
-             "Name store added record for `%s': %s\n", 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Name store added record for `%s': %s\n",
              name, (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
   if (success == GNUNET_OK)
     res = 0;
@@ -112,16 +111,16 @@ put_cont (void *cls, int32_t success, const char *emsg)
 }
 
 
-static struct GNUNET_NAMESTORE_RecordData *
-create_record (int count)
+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));
-  for (c = 0; c < RECORDS; c++)
+  rd = GNUNET_malloc (count * sizeof (struct GNUNET_GNSRECORD_Data));
+  for (c = 0; c < count; c++)
   {
-    rd[c].expiration = GNUNET_TIME_absolute_get();
+    rd[c].expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
     rd[c].record_type = TEST_RECORD_TYPE;
     rd[c].data_size = TEST_RECORD_DATALEN;
     rd[c].data = GNUNET_malloc(TEST_RECORD_DATALEN);
@@ -132,48 +131,33 @@ create_record (int count)
 
 
 static void
-delete_existing_db (const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  char *afsdir;
-
-  if (GNUNET_OK ==
-      GNUNET_CONFIGURATION_get_value_filename (cfg, "namestore-sqlite",
-                                               "FILENAME", &afsdir))
-  {
-    if (GNUNET_OK == GNUNET_DISK_file_test (afsdir))
-      if (GNUNET_OK == GNUNET_DISK_file_test (afsdir))
-        if (GNUNET_OK == GNUNET_DISK_directory_remove(afsdir))
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deleted existing database `%s' \n", afsdir);
-   GNUNET_free (afsdir);
-  }
-}
-
-
-static void
-run (void *cls, 
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_CRYPTO_RsaSignature *signature;
-  const char * s_name = "dummy.dummy.gnunet";
+  struct GNUNET_CRYPTO_EcdsaSignature *signature;
+  char * s_name;
   int c;
   char *hostkey_file;
+  struct GNUNET_TIME_Absolute et;
 
-  delete_existing_db(cfg);
   endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL);
   /* load privat key */
   GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
       "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
-  privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file);
+  privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
   GNUNET_assert (privkey != NULL);
   GNUNET_free (hostkey_file);
   /* get public key */
-  GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey);
+  GNUNET_CRYPTO_ecdsa_key_get_public(privkey, &pubkey);
   nsh = GNUNET_NAMESTORE_connect (cfg);
   GNUNET_break (NULL != nsh);
   /* create record */
+  s_name = GNUNET_GNSRECORD_string_to_lowercase ("DUMMY.dummy.gnunet");
   s_rd = create_record (RECORDS);
-  signature = GNUNET_NAMESTORE_create_signature(privkey, s_rd[0].expiration, s_name, s_rd, RECORDS);
+  et.abs_value_us = s_rd[0].expiration_time;
+  signature = GNUNET_NAMESTORE_create_signature(privkey, et, s_name, s_rd, RECORDS);
   GNUNET_break (s_rd != NULL);
   GNUNET_break (s_name != NULL);
   GNUNET_NAMESTORE_record_put (nsh, &pubkey, s_name,
@@ -183,6 +167,7 @@ run (void *cls,
   for (c = 0; c < RECORDS; c++)
     GNUNET_free_non_null((void *) s_rd[c].data);
   GNUNET_free (s_rd);
+  GNUNET_free (s_name);
 }
 
 
@@ -190,11 +175,10 @@ int
 main (int argc, char *argv[])
 {
   res = 1;
-  if (0 != GNUNET_TESTING_service_run ("test-namestore-api-put",
-                                      "namestore",
-                                      "test_namestore_api.conf",
-                                      &run,
-                                      NULL))
+  if (0 != GNUNET_TESTING_peer_run ("test-namestore-api-put",
+                                    "test_namestore_api.conf",
+                                    &run,
+                                    NULL))
     return 1;
   return res;
 }