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"
static struct GNUNET_CRYPTO_RsaPrivateKey * privkey;
static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey;
-static GNUNET_HashCode zone;
+static struct GNUNET_CRYPTO_ShortHashCode zone;
+
+static struct GNUNET_CRYPTO_RsaPrivateKey * privkey2;
+static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey2;
+static struct GNUNET_CRYPTO_ShortHashCode zone2;
static struct GNUNET_NAMESTORE_ZoneIterator *zi;
static int res;
+static int returned_records;
struct GNUNET_CRYPTO_RsaSignature *sig_1;
char * s_name_1;
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)
{
if (0 != GNUNET_OS_process_kill (arm, SIGTERM))
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
GNUNET_OS_process_wait (arm);
- GNUNET_OS_process_close (arm);
+ GNUNET_OS_process_destroy (arm);
arm = NULL;
}
}
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)
{
GNUNET_free ((void *)s_rd_1->data);
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();
endbadly_task = GNUNET_SCHEDULER_NO_TASK;
}
-
if (privkey != NULL)
GNUNET_CRYPTO_rsa_key_free (privkey);
privkey = NULL;
- GNUNET_free_non_null(sig_1);
- GNUNET_free_non_null(sig_2);
- GNUNET_free_non_null(s_name_1);
- GNUNET_free_non_null(s_name_2);
+ 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);
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);
if (NULL != arm)
stop_arm();
-
- res = 0;
}
void zone_proc (void *cls,
const struct GNUNET_CRYPTO_RsaSignature *signature)
{
int failed = GNUNET_NO;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for zone `%s'\n", GNUNET_h2s (&zone));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for zone `%s'\n", GNUNET_short_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
failed = GNUNET_YES;
GNUNET_break (0);
}
-
}
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)
{
+ returned_records ++;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Telling namestore to send the next result\n");
GNUNET_NAMESTORE_zone_iterator_next (zi);
}
{
c++;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record %u \n", c);
-
+ }
+ else
+ {
+ 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);
}
- if (c == 2)
+ if (c == 3)
{
+ res = 1;
+ returned_records = 0;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All records created, starting iteration over zone `%s'\n",
+ GNUNET_short_h2s(&zone));
zi = GNUNET_NAMESTORE_zone_iteration_start(nsh,
&zone,
GNUNET_NAMESTORE_RF_NONE,
&zone);
if (zi == NULL)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone iterator\n");
GNUNET_break (0);
GNUNET_SCHEDULER_cancel (endbadly_task);
endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
for (c = 0; c < count; c++)
{
- rd[c].expiration = GNUNET_TIME_absolute_get();
- rd[c].record_type = 1111;
- rd[c].data_size = 50;
- rd[c].data = GNUNET_malloc(50);
- memset ((char *) rd[c].data, 'a', 50);
+ rd[c].expiration = GNUNET_TIME_absolute_get();
+ rd[c].record_type = 1111;
+ rd[c].data_size = 50;
+ rd[c].data = GNUNET_malloc(50);
+ memset ((char *) rd[c].data, 'a', 50);
}
return rd;
}
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,
+ "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);
+ GNUNET_free (hostkey_file);
GNUNET_assert (privkey != NULL);
GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey);
- GNUNET_CRYPTO_hash(&pubkey, sizeof (pubkey), &zone);
+ GNUNET_CRYPTO_short_hash (&pubkey, sizeof (pubkey), &zone);
+
+ GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
+ "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey");
+ 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_short_hash (&pubkey2, sizeof (pubkey), &zone2);
+
start_arm (cfgfile);
GNUNET_assert (arm != NULL);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 1\n");
-
-
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);
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_UNIT_FOREVER_ABS, 1, s_rd_3, sig_3, &put_cont, NULL);
}
static int
return ret;
}
-/* end of test_namestore_api_zone_iteration.c */
+/* end of test_namestore_api_zone_iteration_specific_zone.c */
projects / oweals / gnunet.git / blobdiff