- changes to signing verfifying: includes block expiration

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

diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
index 01903699124b689e73be7e9cb35dc43755f36ff5..ae8e2da5c1e56024874fe013c37ddc6fad040194 100644 (file)
--- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
+++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
@@ -18,8 +18,8 @@
      Boston, MA 02111-1307, USA.
 */
 /**
- * @file namestore/test_namestore_api_zone_iteration.c
- * @brief testcase for namestore_api.c zone iteration functionality
+ * @file namestore/test_namestore_api_zone_iteration_specific_zone.c
+ * @brief testcase for zone iteration functionality: iterate of a specific zone
  */
 #include "platform.h"
 #include "gnunet_common.h"
@@ -40,8 +40,13 @@ static struct GNUNET_CRYPTO_RsaPrivateKey * privkey;
 static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey;
 static GNUNET_HashCode zone;
 
+static struct GNUNET_CRYPTO_RsaPrivateKey * privkey2;
+static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey2;
+static GNUNET_HashCode zone2;
+
 static struct GNUNET_NAMESTORE_ZoneIterator *zi;
 static int res;
+static int returned_records;
 
 struct GNUNET_CRYPTO_RsaSignature *sig_1;
 char * s_name_1;
@@ -51,6 +56,10 @@ struct GNUNET_CRYPTO_RsaSignature *sig_2;
 char * s_name_2;
 struct GNUNET_NAMESTORE_RecordData *s_rd_2;
 
+struct GNUNET_CRYPTO_RsaSignature *sig_3;
+char * s_name_3;
+struct GNUNET_NAMESTORE_RecordData *s_rd_3;
+
 static void
 start_arm (const char *cfgname)
 {
@@ -98,8 +107,10 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   GNUNET_free_non_null(sig_1);
   GNUNET_free_non_null(sig_2);
+  GNUNET_free_non_null(sig_3);
   GNUNET_free_non_null(s_name_1);
   GNUNET_free_non_null(s_name_2);
+  GNUNET_free_non_null(s_name_3);
 
   if (s_rd_1 != NULL)
   {
@@ -111,11 +122,20 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_free ((void *)s_rd_2->data);
     GNUNET_free (s_rd_2);
   }
+  if (s_rd_3 != NULL)
+  {
+    GNUNET_free ((void *)s_rd_3->data);
+    GNUNET_free (s_rd_3);
+  }
 
   if (privkey != NULL)
     GNUNET_CRYPTO_rsa_key_free (privkey);
   privkey = NULL;
 
+  if (privkey2 != NULL)
+    GNUNET_CRYPTO_rsa_key_free (privkey2);
+  privkey2 = NULL;
+
   if (NULL != arm)
     stop_arm();
 
@@ -142,10 +162,16 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_CRYPTO_rsa_key_free (privkey);
   privkey = NULL;
 
+  if (privkey2 != NULL)
+    GNUNET_CRYPTO_rsa_key_free (privkey2);
+  privkey2 = NULL;
+
   GNUNET_free (sig_1);
   GNUNET_free (sig_2);
+  GNUNET_free (sig_3);
   GNUNET_free (s_name_1);
   GNUNET_free (s_name_2);
+  GNUNET_free (s_name_3);
   if (s_rd_1 != NULL)
   {
     GNUNET_free ((void *)s_rd_1->data);
@@ -156,6 +182,11 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_free ((void *)s_rd_2->data);
     GNUNET_free (s_rd_2);
   }
+  if (s_rd_3 != NULL)
+  {
+    GNUNET_free ((void *)s_rd_3->data);
+    GNUNET_free (s_rd_3);
+  }
 
   if (nsh != NULL)
     GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
@@ -178,7 +209,13 @@ void zone_proc (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for zone `%s'\n", GNUNET_h2s (&zone));
   if ((zone_key == NULL) &&  (name == NULL))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received last result, iteration done\n");
+    GNUNET_break (2 == returned_records);
+    if (2 == returned_records)
+      res = 0;
+    else
+      res = 1;
+
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received last result, iteration done after %u records\n", returned_records);
     GNUNET_SCHEDULER_add_now (&end, NULL);
   }
   else
@@ -228,14 +265,15 @@ void zone_proc (void *cls,
     }
     else
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Comparing result `%s'\n", name);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Comparing result failed: got name `%s'\n", name);
+      res = 1;
       GNUNET_break (0);
       GNUNET_SCHEDULER_add_now (&end, NULL);
     }
 
     if (failed == GNUNET_NO)
     {
-      res --;
+      returned_records ++;
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Telling namestore to send the next result\n");
       GNUNET_NAMESTORE_zone_iterator_next (zi);
     }
@@ -283,9 +321,10 @@ put_cont (void *cls, int32_t success, const char *emsg)
     endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
   }
 
-  if (c == 2)
+  if (c == 3)
   {
-    res = 2;
+    res = 1;
+    returned_records = 0;
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All records created, starting iteration over zone `%s'\n",
         GNUNET_h2s(&zone));
     zi = GNUNET_NAMESTORE_zone_iteration_start(nsh,
@@ -329,11 +368,24 @@ run (void *cls, char *const *args, const char *cfgfile,
   delete_existing_db(cfg);
   endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,&endbadly, NULL);
 
-  privkey = GNUNET_CRYPTO_rsa_key_create_from_file("hostkey");
+  char *hostkey_file;
+  GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "4UCICULTINKC87UO4326KEEDQ9MTEP2AJT88MJFVGTGNK12QNGMQI2S41VI07UUU6EO19BTB06PDL0HE6VP1OM50HOJEI75RHP4JP80.zone");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
+  privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file);
+  GNUNET_free (hostkey_file);
   GNUNET_assert (privkey != NULL);
   GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey);
   GNUNET_CRYPTO_hash(&pubkey, sizeof (pubkey), &zone);
 
+  GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "KJI3AL00K91EDPFJF58DAJM7H61D189TLP70N56JL8SVDCJE1SJ3SNNBOQPPONTL37FMHPS39SMK2NMVC0GQMGA6QCMHITT78O8GF80.zone");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
+  privkey2 = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file);
+  GNUNET_free (hostkey_file);
+  GNUNET_assert (privkey2 != NULL);
+  GNUNET_CRYPTO_rsa_key_get_public(privkey2, &pubkey2);
+  GNUNET_CRYPTO_hash(&pubkey2, sizeof (pubkey), &zone2);
+
+
   start_arm (cfgfile);
   GNUNET_assert (arm != NULL);
 
@@ -344,7 +396,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 
   GNUNET_asprintf(&s_name_1, "dummy1");
   s_rd_1 = create_record(1);
-  sig_1 = GNUNET_NAMESTORE_create_signature(privkey, s_name_1, s_rd_1, 1);
+  sig_1 = GNUNET_NAMESTORE_create_signature(privkey, s_rd_1[0].expiration ,s_name_1, s_rd_1, 1);
   GNUNET_NAMESTORE_record_create(nsh, privkey, s_name_1, s_rd_1, &put_cont, NULL);
 
 
@@ -352,8 +404,15 @@ run (void *cls, char *const *args, const char *cfgfile,
   GNUNET_asprintf(&s_name_2, "dummy2");
   s_rd_2 = create_record(1);
 
-  sig_2 = GNUNET_NAMESTORE_create_signature(privkey, s_name_2, s_rd_2, 1);
+  sig_2 = GNUNET_NAMESTORE_create_signature(privkey, s_rd_2[0].expiration, s_name_2, s_rd_2, 1);
   GNUNET_NAMESTORE_record_create(nsh, privkey, s_name_2, s_rd_2, &put_cont, NULL);
+
+  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);
+  sig_3 = GNUNET_NAMESTORE_create_signature(privkey, s_rd_3[0].expiration, s_name_3, s_rd_3, 1);
+  GNUNET_NAMESTORE_record_put (nsh, &pubkey2, s_name_3, GNUNET_TIME_absolute_get_forever(), 1, s_rd_3, sig_3, &put_cont, NULL);
 }
 
 static int
@@ -387,4 +446,4 @@ main (int argc, char *argv[])
   return ret;
 }
 
-/* end of test_namestore_api_zone_iteration.c */
+/* end of test_namestore_api_zone_iteration_specific_zone.c */