-fix leaks

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

diff --git a/src/namestore/test_namestore_api_store_update.c b/src/namestore/test_namestore_api_store_update.c
index 4aa058a91a11b793ec80c7eb26bf547c00489a7b..b68d59a6b3f18376c9e3b2395fdfa47a7cbb2ece 100644 (file)
--- a/src/namestore/test_namestore_api_store_update.c
+++ b/src/namestore/test_namestore_api_store_update.c
@@ -23,6 +23,7 @@
  * @author Matthias Wachs
  */
 #include "platform.h"
+#include "gnunet_namecache_service.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
 
@@ -44,6 +45,8 @@
 
 static struct GNUNET_NAMESTORE_Handle *nsh;
 
+static struct GNUNET_NAMECACHE_Handle *nch;
+
 static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
 static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
@@ -56,7 +59,9 @@ static int update_performed;
 
 static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
 
-static const char * name = "dummy.dummy.gnunet";
+static struct GNUNET_NAMECACHE_QueueEntry *ncqe;
+
+static const char *name = "dummy";
 
 
 static void
@@ -67,6 +72,11 @@ cleanup ()
     GNUNET_NAMESTORE_disconnect (nsh);
     nsh = NULL;
   }
+  if (NULL != nch)
+  {
+    GNUNET_NAMECACHE_disconnect (nch);
+    nch = NULL;
+  }
   if (NULL != privkey)
   {
     GNUNET_free (privkey);
@@ -91,6 +101,11 @@ endbadly (void *cls,
     GNUNET_NAMESTORE_cancel (nsqe);
     nsqe = NULL;
   }
+  if (NULL != ncqe)
+  {
+    GNUNET_NAMECACHE_cancel (ncqe);
+    ncqe = NULL;
+  }
   cleanup ();
   res = 1;
 }
@@ -112,9 +127,9 @@ put_cont (void *cls, int32_t success, const char *emsg);
 static void
 rd_decrypt_cb (void *cls,
                unsigned int rd_count,
-               const struct GNUNET_NAMESTORE_RecordData *rd)
+               const struct GNUNET_GNSRECORD_Data *rd)
 {
-  struct GNUNET_NAMESTORE_RecordData rd_new;
+  struct GNUNET_GNSRECORD_Data rd_new;
 
   GNUNET_assert (1 == rd_count);
   GNUNET_assert (NULL != rd);
@@ -131,8 +146,8 @@ rd_decrypt_cb (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Block was decrypted successfully, updating record \n");
 
-    rd_new.flags = GNUNET_NAMESTORE_RF_NONE;
-    rd_new.expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
+    rd_new.flags = GNUNET_GNSRECORD_RF_NONE;
+    rd_new.expiration_time = GNUNET_TIME_absolute_get().abs_value_us + 1000000000;
     rd_new.record_type = TEST_RECORD_TYPE2;
     rd_new.data_size = TEST_RECORD_DATALEN2;
     rd_new.data = GNUNET_malloc (TEST_RECORD_DATALEN2);
@@ -151,6 +166,8 @@ rd_decrypt_cb (void *cls,
     GNUNET_assert (TEST_RECORD_DATALEN2 == rd[0].data_size);
     GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN2));
 
+    GNUNET_SCHEDULER_cancel (endbadly_task);
+    endbadly_task = GNUNET_SCHEDULER_NO_TASK;
     GNUNET_SCHEDULER_add_now (&end, NULL);
   }
 }
@@ -158,23 +175,17 @@ rd_decrypt_cb (void *cls,
 
 static void
 name_lookup_proc (void *cls,
-                  const struct GNUNET_NAMESTORE_Block *block)
+                  const struct GNUNET_GNSRECORD_Block *block)
 {
   const char *name = cls;
-  nsqe = NULL;
 
+  ncqe = NULL;
   GNUNET_assert (NULL != cls);
-
-  if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
-  {
-    GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task = GNUNET_SCHEDULER_NO_TASK;
-  }
-
   if (NULL == block)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-             _("Namestore returned no block\n"));
+                _("Namecache returned no block for `%s'\n"),
+                name);
     if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
       GNUNET_SCHEDULER_cancel (endbadly_task);
     endbadly_task =  GNUNET_SCHEDULER_add_now (&endbadly, NULL);
@@ -182,8 +193,8 @@ name_lookup_proc (void *cls,
   }
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Namestore returned block, decrypting \n");
-  GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_block_decrypt(block,
+             "Namecache returned block, decrypting \n");
+  GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_block_decrypt(block,
                &pubkey, name, &rd_decrypt_cb, (void *) name));
 }
 
@@ -194,18 +205,21 @@ put_cont (void *cls, int32_t success, const char *emsg)
   const char *name = cls;
   struct GNUNET_HashCode derived_hash;
 
+  nsqe = NULL;
   GNUNET_assert (NULL != cls);
-
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Name store added record for `%s': %s\n",
              name,
              (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
-
   /* Create derived hash */
-  GNUNET_NAMESTORE_query_from_private_key (privkey, name, &derived_hash);
-
-  nsqe = GNUNET_NAMESTORE_lookup_block (nsh, &derived_hash,
-                                        &name_lookup_proc, (void *) name);
+  GNUNET_GNSRECORD_query_from_private_key (privkey,
+                                           name,
+                                           &derived_hash);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Looking in namecache for `%s'\n",
+              GNUNET_h2s (&derived_hash));
+  ncqe = GNUNET_NAMECACHE_lookup_block (nch, &derived_hash,
+                                        &name_lookup_proc, (void *) name);
 }
 
 
@@ -214,7 +228,7 @@ run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *cfg,
      struct GNUNET_TESTING_Peer *peer)
 {
-  struct GNUNET_NAMESTORE_RecordData rd;
+  struct GNUNET_GNSRECORD_Data rd;
   char *hostkey_file;
 
   update_performed = GNUNET_NO;
@@ -230,8 +244,8 @@ run (void *cls,
   GNUNET_assert (privkey != NULL);
   GNUNET_CRYPTO_ecdsa_key_get_public (privkey, &pubkey);
 
-  rd.flags = GNUNET_NAMESTORE_RF_NONE;
-  rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
+  rd.flags = GNUNET_GNSRECORD_RF_NONE;
+  rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us + 1000000000;
   rd.record_type = TEST_RECORD_TYPE;
   rd.data_size = TEST_RECORD_DATALEN;
   rd.data = GNUNET_malloc (TEST_RECORD_DATALEN);
@@ -239,14 +253,17 @@ run (void *cls,
 
   nsh = GNUNET_NAMESTORE_connect (cfg);
   GNUNET_break (NULL != nsh);
-  nsqe = GNUNET_NAMESTORE_records_store (nsh, privkey, name,
-                                     1, &rd, &put_cont, (void *) name);
+  nch = GNUNET_NAMECACHE_connect (cfg);
+  GNUNET_break (NULL != nch);
+  nsqe = GNUNET_NAMESTORE_records_store (nsh,
+                                         privkey, name,
+                                         1, &rd,
+                                         &put_cont, (void *) name);
   if (NULL == nsqe)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
              _("Namestore cannot store no block\n"));
   }
-
   GNUNET_free ((void *)rd.data);
 }
 
@@ -257,11 +274,10 @@ main (int argc, char *argv[])
   GNUNET_DISK_directory_remove ("/tmp/test-gnunet-namestore/");
   res = 1;
   if (0 !=
-      GNUNET_TESTING_service_run ("test-namestore-api-store-update",
-                                 "namestore",
-                                 "test_namestore_api.conf",
-                                 &run,
-                                 NULL))
+      GNUNET_TESTING_peer_run ("test-namestore-api-store-update",
+                               "test_namestore_api.conf",
+                               &run,
+                               NULL))
     return 1;
   return res;
 }