[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22125 - gnunet/src/namestore
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r22125 - gnunet/src/namestore |
|
Date: |
Wed, 20 Jun 2012 00:17:25 +0200 |
Author: grothoff
Date: 2012-06-20 00:17:25 +0200 (Wed, 20 Jun 2012)
New Revision: 22125
Modified:
gnunet/src/namestore/test_namestore_api.c
gnunet/src/namestore/test_namestore_api_create.c
gnunet/src/namestore/test_namestore_api_create_update.c
gnunet/src/namestore/test_namestore_api_lookup.c
gnunet/src/namestore/test_namestore_api_lookup_specific_type.c
gnunet/src/namestore/test_namestore_api_put.c
gnunet/src/namestore/test_namestore_api_remove.c
gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
gnunet/src/namestore/test_namestore_api_sign_verify.c
gnunet/src/namestore/test_namestore_api_zone_iteration.c
gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
gnunet/src/namestore/test_namestore_api_zone_to_name.c
gnunet/src/namestore/test_namestore_record_serialization.c
gnunet/src/namestore/test_plugin_namestore.c
Log:
-fixing testcases with new expiration code
Modified: gnunet/src/namestore/test_namestore_api.c
===================================================================
--- gnunet/src/namestore/test_namestore_api.c 2012-06-19 22:01:26 UTC (rev
22124)
+++ gnunet/src/namestore/test_namestore_api.c 2012-06-19 22:17:25 UTC (rev
22125)
@@ -140,7 +140,7 @@
GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey);
GNUNET_CRYPTO_short_hash (&pubkey, sizeof (pubkey), &zone);
memset (&signature, '\0', sizeof (signature));
- rd.expiration = GNUNET_TIME_absolute_get();
+ rd.expiration_time = GNUNET_TIME_absolute_get().abs_value;
rd.record_type = TEST_RECORD_TYPE;
rd.data_size = TEST_RECORD_DATALEN;
rd.data = GNUNET_malloc(TEST_RECORD_DATALEN);
Modified: gnunet/src/namestore/test_namestore_api_create.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_create.c 2012-06-19 22:01:26 UTC
(rev 22124)
+++ gnunet/src/namestore/test_namestore_api_create.c 2012-06-19 22:17:25 UTC
(rev 22125)
@@ -279,7 +279,7 @@
/* create a second record */
s_second_record = GNUNET_malloc(sizeof (struct
GNUNET_NAMESTORE_RecordData) + TEST_CREATE_RECORD_DATALEN);
- s_second_record->expiration = GNUNET_TIME_UNIT_FOREVER_ABS;
+ s_second_record->expiration_time = UINT64_MAX;
s_second_record->record_type = TEST_CREATE_RECORD_TYPE;
s_second_record->flags = GNUNET_NAMESTORE_RF_AUTHORITY;
s_second_record->data = &s_second_record[1];
@@ -323,21 +323,20 @@
static struct GNUNET_NAMESTORE_RecordData *
-create_record (int count)
+create_record (unsigned int count)
{
- int c;
+ unsigned int c;
struct GNUNET_NAMESTORE_RecordData * rd;
+
rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData));
-
for (c = 0; c < count; c++)
{
- rd[c].expiration = GNUNET_TIME_absolute_get();
- rd[c].record_type = TEST_RECORD_TYPE;
- rd[c].data_size = TEST_RECORD_DATALEN;
- rd[c].data = GNUNET_malloc(TEST_RECORD_DATALEN);
- memset ((char *) rd[c].data, TEST_RECORD_DATA, TEST_RECORD_DATALEN);
+ rd[c].expiration_time = GNUNET_TIME_absolute_get().abs_value;
+ rd[c].record_type = TEST_RECORD_TYPE;
+ rd[c].data_size = TEST_RECORD_DATALEN;
+ rd[c].data = GNUNET_malloc(TEST_RECORD_DATALEN);
+ memset ((char *) rd[c].data, TEST_RECORD_DATA, TEST_RECORD_DATALEN);
}
-
return rd;
}
@@ -348,6 +347,7 @@
{
size_t rd_ser_len;
char *hostkey_file;
+ struct GNUNET_TIME_Absolute et;
endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,endbadly, NULL);
/* load privat key */
@@ -366,9 +366,9 @@
rd_ser_len = GNUNET_NAMESTORE_records_get_size(1, s_first_record);
char rd_ser[rd_ser_len];
GNUNET_NAMESTORE_records_serialize(1, s_first_record, rd_ser_len, rd_ser);
+ et.abs_value = s_first_record->expiration_time;
+ s_signature = GNUNET_NAMESTORE_create_signature(privkey, et, s_name,
s_first_record, 1);
- s_signature = GNUNET_NAMESTORE_create_signature(privkey,
s_first_record->expiration, s_name, s_first_record, 1);
-
/* create random zone hash */
GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone);
Modified: gnunet/src/namestore/test_namestore_api_create_update.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_create_update.c 2012-06-19
22:01:26 UTC (rev 22124)
+++ gnunet/src/namestore/test_namestore_api_create_update.c 2012-06-19
22:17:25 UTC (rev 22125)
@@ -138,7 +138,7 @@
if (success == GNUNET_NO)
{
res = 0;
- s_first_record->expiration = GNUNET_TIME_absolute_get ();
+ s_first_record->expiration_time = GNUNET_TIME_absolute_get ().abs_value;
GNUNET_NAMESTORE_record_create (nsh, privkey, s_name, s_first_record,
&create_updated_cont, s_name);
}
else
@@ -173,21 +173,20 @@
static struct GNUNET_NAMESTORE_RecordData *
-create_record (int count)
+create_record (unsigned int count)
{
- int c;
+ unsigned int c;
struct GNUNET_NAMESTORE_RecordData * rd;
+
rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData));
-
for (c = 0; c < count; c++)
{
- rd[c].expiration = GNUNET_TIME_UNIT_ZERO_ABS;
+ rd[c].expiration_time = 0;
rd[c].record_type = TEST_RECORD_TYPE;
rd[c].data_size = TEST_RECORD_DATALEN;
rd[c].data = GNUNET_malloc(TEST_RECORD_DATALEN);
memset ((char *) rd[c].data, TEST_RECORD_DATA, TEST_RECORD_DATALEN);
}
-
return rd;
}
@@ -198,6 +197,7 @@
{
size_t rd_ser_len;
char *hostkey_file;
+ struct GNUNET_TIME_Absolute et;
endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL);
@@ -219,7 +219,8 @@
char rd_ser[rd_ser_len];
GNUNET_NAMESTORE_records_serialize(1, s_first_record, rd_ser_len, rd_ser);
- s_signature = GNUNET_NAMESTORE_create_signature(privkey,
s_first_record->expiration, s_name, s_first_record, 1);
+ et.abs_value = s_first_record->expiration_time;
+ s_signature = GNUNET_NAMESTORE_create_signature(privkey, et, s_name,
s_first_record, 1);
/* create random zone hash */
GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone);
Modified: gnunet/src/namestore/test_namestore_api_lookup.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup.c 2012-06-19 22:01:26 UTC
(rev 22124)
+++ gnunet/src/namestore/test_namestore_api_lookup.c 2012-06-19 22:17:25 UTC
(rev 22125)
@@ -176,21 +176,20 @@
static struct GNUNET_NAMESTORE_RecordData *
-create_record (int count)
+create_record (unsigned int count)
{
- int c;
+ unsigned int c;
struct GNUNET_NAMESTORE_RecordData * rd;
+
rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData));
-
- for (c = 0; c < RECORDS; c++)
+ for (c = 0; c < count; c++)
{
- rd[c].expiration = GNUNET_TIME_absolute_get();
+ rd[c].expiration_time = GNUNET_TIME_absolute_get().abs_value;
rd[c].record_type = TEST_RECORD_TYPE;
rd[c].data_size = TEST_RECORD_DATALEN;
rd[c].data = GNUNET_malloc(TEST_RECORD_DATALEN);
memset ((char *) rd[c].data, TEST_RECORD_DATA, TEST_RECORD_DATALEN);
}
-
return rd;
}
@@ -200,6 +199,7 @@
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
size_t rd_ser_len;
+ struct GNUNET_TIME_Absolute et;
endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL);
@@ -218,8 +218,9 @@
GNUNET_NAMESTORE_records_serialize(RECORDS, s_rd, rd_ser_len, rd_ser);
/* sign */
- s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_rd[0].expiration,
s_name, s_rd, RECORDS);
-
+ et.abs_value = s_rd[0].expiration_time;
+ s_signature = GNUNET_NAMESTORE_create_signature(privkey, et, s_name, s_rd,
RECORDS);
+
/* create random zone hash */
GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone);
nsh = GNUNET_NAMESTORE_connect (cfg);
Modified: gnunet/src/namestore/test_namestore_api_lookup_specific_type.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup_specific_type.c
2012-06-19 22:01:26 UTC (rev 22124)
+++ gnunet/src/namestore/test_namestore_api_lookup_specific_type.c
2012-06-19 22:17:25 UTC (rev 22125)
@@ -18,7 +18,7 @@
Boston, MA 02111-1307, USA.
*/
/**
- * @file namestore/test_namestore_api.c
+ * @file namestore/test_namestore_api_lookup_sepecific_type.c
* @brief testcase for namestore_api.c
*/
#include "platform.h"
@@ -246,21 +246,21 @@
static struct GNUNET_NAMESTORE_RecordData *
-create_record (int count)
+create_record (unsigned int count)
{
- int c;
+ unsigned int c;
struct GNUNET_NAMESTORE_RecordData * rd;
rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData));
- for (c = 0; c < RECORDS-1; c++)
+ for (c = 0; c < count-1; c++)
{
- rd[c].expiration = GNUNET_TIME_UNIT_ZERO_ABS;
+ rd[c].expiration_time = 0;
rd[c].record_type = 1;
rd[c].data_size = TEST_RECORD_DATALEN;
rd[c].data = GNUNET_malloc(TEST_RECORD_DATALEN);
memset ((char *) rd[c].data, TEST_RECORD_DATA, TEST_RECORD_DATALEN);
}
- rd[c].expiration = GNUNET_TIME_absolute_get();
+ rd[c].expiration_time = GNUNET_TIME_absolute_get().abs_value;
rd[c].record_type = TEST_RECORD_LOOKUP_TYPE_EXISTING;
rd[c].data_size = TEST_RECORD_DATALEN;
rd[c].data = GNUNET_malloc(TEST_RECORD_DATALEN);
@@ -276,6 +276,7 @@
{
size_t rd_ser_len;
char *hostkey_file;
+ struct GNUNET_TIME_Absolute et;
endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL);
/* load privat key */
@@ -298,7 +299,8 @@
GNUNET_NAMESTORE_records_serialize(RECORDS, s_rd, rd_ser_len, rd_ser);
/* sign */
- s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_rd[RECORDS
-1].expiration, s_name, s_rd, RECORDS);
+ et.abs_value = s_rd[RECORDS - 1].expiration_time;
+ s_signature = GNUNET_NAMESTORE_create_signature(privkey, et, s_name, s_rd,
RECORDS);
/* create random zone hash */
GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone);
Modified: gnunet/src/namestore/test_namestore_api_put.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_put.c 2012-06-19 22:01:26 UTC
(rev 22124)
+++ gnunet/src/namestore/test_namestore_api_put.c 2012-06-19 22:17:25 UTC
(rev 22125)
@@ -113,15 +113,15 @@
static struct GNUNET_NAMESTORE_RecordData *
-create_record (int count)
+create_record (unsigned int count)
{
unsigned int c;
struct GNUNET_NAMESTORE_RecordData * rd;
rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData));
- for (c = 0; c < RECORDS; c++)
+ for (c = 0; c < count; c++)
{
- rd[c].expiration = GNUNET_TIME_absolute_get();
+ rd[c].expiration_time = GNUNET_TIME_absolute_get().abs_value;
rd[c].record_type = TEST_RECORD_TYPE;
rd[c].data_size = TEST_RECORD_DATALEN;
rd[c].data = GNUNET_malloc(TEST_RECORD_DATALEN);
@@ -139,6 +139,7 @@
const char * s_name = "dummy.dummy.gnunet";
int c;
char *hostkey_file;
+ struct GNUNET_TIME_Absolute et;
endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL);
/* load privat key */
@@ -154,7 +155,8 @@
GNUNET_break (NULL != nsh);
/* create record */
s_rd = create_record (RECORDS);
- signature = GNUNET_NAMESTORE_create_signature(privkey, s_rd[0].expiration,
s_name, s_rd, RECORDS);
+ et.abs_value = 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,
Modified: gnunet/src/namestore/test_namestore_api_remove.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_remove.c 2012-06-19 22:01:26 UTC
(rev 22124)
+++ gnunet/src/namestore/test_namestore_api_remove.c 2012-06-19 22:17:25 UTC
(rev 22125)
@@ -214,21 +214,20 @@
static struct GNUNET_NAMESTORE_RecordData *
-create_record (int count)
+create_record (unsigned int count)
{
- int c;
+ unsigned int c;
struct GNUNET_NAMESTORE_RecordData * rd;
+
rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData));
-
- rd[0].expiration = GNUNET_TIME_absolute_get();
+ rd[0].expiration_time = GNUNET_TIME_absolute_get().abs_value;
rd[0].record_type = 0;
rd[0].data_size = TEST_REMOVE_RECORD_DATALEN;
rd[0].data = GNUNET_malloc(TEST_REMOVE_RECORD_DATALEN);
memset ((char *) rd[0].data, TEST_RECORD_DATA, TEST_RECORD_DATALEN);
-
- for (c = 1; c < RECORDS; c++)
+ for (c = 1; c < count; c++)
{
- rd[c].expiration = GNUNET_TIME_UNIT_ZERO_ABS;
+ rd[c].expiration_time = 0;
rd[c].record_type = TEST_RECORD_TYPE;
rd[c].data_size = TEST_RECORD_DATALEN;
rd[c].data = GNUNET_malloc(TEST_RECORD_DATALEN);
@@ -245,6 +244,7 @@
{
size_t rd_ser_len;
char *hostkey_file;
+ struct GNUNET_TIME_Absolute et;
endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL);
/* load privat key */
@@ -266,7 +266,8 @@
GNUNET_NAMESTORE_records_serialize(RECORDS, s_rd, rd_ser_len, rd_ser);
/* sign */
- s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_rd[0].expiration,
s_name, s_rd, RECORDS);
+ et.abs_value = s_rd[0].expiration_time;
+ s_signature = GNUNET_NAMESTORE_create_signature(privkey, et, s_name, s_rd,
RECORDS);
/* create random zone hash */
GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone);
Modified: gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
2012-06-19 22:01:26 UTC (rev 22124)
+++ gnunet/src/namestore/test_namestore_api_remove_not_existing_record.c
2012-06-19 22:17:25 UTC (rev 22125)
@@ -137,7 +137,8 @@
struct GNUNET_NAMESTORE_RecordData rd;
char data[TEST_REMOVE_RECORD_DATALEN];
- rd.expiration = GNUNET_TIME_absolute_get();
+
+ rd.expiration_time = GNUNET_TIME_absolute_get().abs_value;
rd.record_type = TEST_REMOVE_RECORD_TYPE;
rd.data_size = TEST_REMOVE_RECORD_DATALEN;
rd.data = &data;
@@ -154,15 +155,15 @@
static struct GNUNET_NAMESTORE_RecordData *
-create_record (int count)
+create_record (unsigned int count)
{
- int c;
+ unsigned int c;
struct GNUNET_NAMESTORE_RecordData * rd;
rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData));
- for (c = 0; c < RECORDS; c++)
+ for (c = 0; c < count; c++)
{
- rd[c].expiration = GNUNET_TIME_absolute_get();
+ rd[c].expiration_time = GNUNET_TIME_absolute_get().abs_value;
rd[c].record_type = TEST_RECORD_TYPE;
rd[c].data_size = TEST_RECORD_DATALEN;
rd[c].data = GNUNET_malloc(TEST_RECORD_DATALEN);
@@ -178,6 +179,7 @@
{
char *hostkey_file;
size_t rd_ser_len;
+ struct GNUNET_TIME_Absolute et;
endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL);
@@ -200,7 +202,8 @@
GNUNET_NAMESTORE_records_serialize(RECORDS, s_rd, rd_ser_len, rd_ser);
/* sign */
- s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_rd[0].expiration,
s_name, s_rd, RECORDS);
+ et.abs_value = s_rd[0].expiration_time;
+ s_signature = GNUNET_NAMESTORE_create_signature(privkey, et, s_name, s_rd,
RECORDS);
/* create random zone hash */
GNUNET_CRYPTO_hash (&pubkey, sizeof (struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone);
Modified: gnunet/src/namestore/test_namestore_api_sign_verify.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_sign_verify.c 2012-06-19
22:01:26 UTC (rev 22124)
+++ gnunet/src/namestore/test_namestore_api_sign_verify.c 2012-06-19
22:17:25 UTC (rev 22125)
@@ -56,19 +56,18 @@
static struct GNUNET_NAMESTORE_RecordData *
create_record (int count)
{
- int c;
+ unsigned int c;
struct GNUNET_NAMESTORE_RecordData * rd;
- rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData));
- for (c = 0; c < RECORDS; c++)
+ rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData));
+ for (c = 0; c < count; c++)
{
- rd[c].expiration = GNUNET_TIME_absolute_get();
- rd[c].record_type = TEST_RECORD_TYPE;
- rd[c].data_size = TEST_RECORD_DATALEN;
- rd[c].data = GNUNET_malloc(TEST_RECORD_DATALEN);
- memset ((char *) rd[c].data, TEST_RECORD_DATA, TEST_RECORD_DATALEN);
+ rd[c].expiration_time = GNUNET_TIME_absolute_get().abs_value;
+ rd[c].record_type = TEST_RECORD_TYPE;
+ rd[c].data_size = TEST_RECORD_DATALEN;
+ rd[c].data = GNUNET_malloc(TEST_RECORD_DATALEN);
+ memset ((char *) rd[c].data, TEST_RECORD_DATA, TEST_RECORD_DATALEN);
}
-
return rd;
}
Modified: gnunet/src/namestore/test_namestore_api_zone_iteration.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration.c 2012-06-19
22:01:26 UTC (rev 22124)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration.c 2012-06-19
22:17:25 UTC (rev 22125)
@@ -345,15 +345,15 @@
static struct GNUNET_NAMESTORE_RecordData *
-create_record (int count)
+create_record (unsigned int count)
{
- int c;
+ unsigned int c;
struct GNUNET_NAMESTORE_RecordData * rd;
+
rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData));
-
for (c = 0; c < count; c++)
{
- rd[c].expiration = GNUNET_TIME_absolute_get();
+ rd[c].expiration_time = GNUNET_TIME_absolute_get().abs_value;
rd[c].record_type = 1111;
rd[c].data_size = 50;
rd[c].data = GNUNET_malloc(50);
@@ -368,6 +368,7 @@
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
char *hostkey_file;
+ struct GNUNET_TIME_Absolute et;
endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,&endbadly, NULL);
GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
@@ -396,7 +397,8 @@
GNUNET_asprintf(&s_name_1, "dummy1");
s_rd_1 = create_record(1);
- sig_1 = GNUNET_NAMESTORE_create_signature(privkey, s_rd_1->expiration,
s_name_1, s_rd_1, 1);
+ et.abs_value = s_rd_1->expiration_time;
+ sig_1 = GNUNET_NAMESTORE_create_signature(privkey, et, s_name_1, s_rd_1, 1);
GNUNET_NAMESTORE_record_create(nsh, privkey, s_name_1, s_rd_1, &put_cont,
NULL);
@@ -404,14 +406,16 @@
GNUNET_asprintf(&s_name_2, "dummy2");
s_rd_2 = create_record(1);
- sig_2 = GNUNET_NAMESTORE_create_signature(privkey, s_rd_2->expiration,
s_name_2, s_rd_2, 1);
+ et.abs_value = s_rd_2->expiration_time;
+ sig_2 = GNUNET_NAMESTORE_create_signature(privkey, et, 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(privkey2, s_rd_3->expiration,
s_name_3, s_rd_3, 1);
+ et.abs_value = s_rd_3->expiration_time;
+ sig_3 = GNUNET_NAMESTORE_create_signature(privkey2, et, 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);
}
Modified: gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
2012-06-19 22:01:26 UTC (rev 22124)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
2012-06-19 22:17:25 UTC (rev 22125)
@@ -304,15 +304,15 @@
static struct GNUNET_NAMESTORE_RecordData *
-create_record (int count)
+create_record (unsigned int count)
{
- int c;
+ unsigned int c;
struct GNUNET_NAMESTORE_RecordData * rd;
+
rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData));
-
for (c = 0; c < count; c++)
{
- rd[c].expiration = GNUNET_TIME_absolute_get();
+ rd[c].expiration_time = GNUNET_TIME_absolute_get().abs_value;
rd[c].record_type = 1111;
rd[c].data_size = 50;
rd[c].data = GNUNET_malloc(50);
@@ -327,6 +327,7 @@
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
char *hostkey_file;
+ struct GNUNET_TIME_Absolute et;
endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,&endbadly, NULL);
GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
@@ -352,20 +353,23 @@
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_rd_1[0].expiration
,s_name_1, s_rd_1, 1);
+ et.abs_value = s_rd_1[0].expiration_time;
+ sig_1 = GNUNET_NAMESTORE_create_signature(privkey, et, s_name_1, s_rd_1, 1);
GNUNET_NAMESTORE_record_create(nsh, privkey, s_name_1, s_rd_1, &put_cont,
NULL);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 2 \n");
GNUNET_asprintf(&s_name_2, "dummy2");
s_rd_2 = create_record(1);
- sig_2 = GNUNET_NAMESTORE_create_signature(privkey, s_rd_2[0].expiration,
s_name_2, s_rd_2, 1);
+ et.abs_value = s_rd_2[0].expiration_time;
+ sig_2 = GNUNET_NAMESTORE_create_signature(privkey, et, 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);
+ et.abs_value = s_rd_3[0].expiration_time;
+ sig_3 = GNUNET_NAMESTORE_create_signature(privkey, et, 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);
}
Modified: gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
2012-06-19 22:01:26 UTC (rev 22124)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
2012-06-19 22:17:25 UTC (rev 22125)
@@ -353,15 +353,15 @@
static struct GNUNET_NAMESTORE_RecordData *
-create_record (int count)
+create_record (unsigned int count)
{
- int c;
+ unsigned int c;
struct GNUNET_NAMESTORE_RecordData * rd;
+
rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData));
-
for (c = 0; c < count; c++)
{
- rd[c].expiration = GNUNET_TIME_absolute_get();
+ rd[c].expiration_time = GNUNET_TIME_absolute_get().abs_value;
rd[c].record_type = 1111;
rd[c].data_size = 50;
rd[c].data = GNUNET_malloc(50);
@@ -376,6 +376,7 @@
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
char *hostkey_file;
+ struct GNUNET_TIME_Absolute et;
endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,&endbadly, NULL);
GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
@@ -403,7 +404,8 @@
GNUNET_asprintf(&s_name_1, "dummy1");
s_rd_1 = create_record(1);
- sig_1 = GNUNET_NAMESTORE_create_signature(privkey, s_rd_1[0].expiration,
s_name_1, s_rd_1, 1);
+ et.abs_value = s_rd_1[0].expiration_time;
+ sig_1 = GNUNET_NAMESTORE_create_signature(privkey, et, s_name_1, s_rd_1, 1);
GNUNET_NAMESTORE_record_create(nsh, privkey, s_name_1, s_rd_1, &put_cont,
NULL);
@@ -411,14 +413,16 @@
GNUNET_asprintf(&s_name_2, "dummy2");
s_rd_2 = create_record(1);
- sig_2 = GNUNET_NAMESTORE_create_signature(privkey, s_rd_2[0].expiration,
s_name_2, s_rd_2, 1);
+ et.abs_value = s_rd_2[0].expiration_time;
+ sig_2 = GNUNET_NAMESTORE_create_signature(privkey, et, 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(privkey2, s_rd_3[0].expiration,
s_name_3, s_rd_3, 1);
+ et.abs_value = s_rd_3[0].expiration_time;
+ sig_3 = GNUNET_NAMESTORE_create_signature(privkey2, et, 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);
}
Modified: gnunet/src/namestore/test_namestore_api_zone_to_name.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_to_name.c 2012-06-19
22:01:26 UTC (rev 22124)
+++ gnunet/src/namestore/test_namestore_api_zone_to_name.c 2012-06-19
22:17:25 UTC (rev 22125)
@@ -165,6 +165,8 @@
run (void *cls,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
+ struct GNUNET_TIME_Absolute et;
+
endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL);
GNUNET_asprintf(&s_name, "dummy");
/* load privat key */
@@ -184,7 +186,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using PKEY `%s' \n", GNUNET_short_h2s
(&s_zone_value));
struct GNUNET_NAMESTORE_RecordData rd;
- rd.expiration = GNUNET_TIME_absolute_get();
+ rd.expiration_time = GNUNET_TIME_absolute_get().abs_value;
rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
rd.data_size = sizeof (struct GNUNET_CRYPTO_ShortHashCode);
rd.data = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_ShortHashCode));
@@ -193,7 +195,8 @@
GNUNET_break (NULL != nsh);
expire = GNUNET_TIME_absolute_get ();
- s_signature = GNUNET_NAMESTORE_create_signature(privkey, rd.expiration,
s_name, &rd, 1);
+ et.abs_value = rd.expiration_time;
+ s_signature = GNUNET_NAMESTORE_create_signature(privkey, et, s_name, &rd, 1);
GNUNET_NAMESTORE_record_put(nsh, &pubkey, s_name, expire, 1, &rd,
s_signature, put_cont, NULL);
GNUNET_free ((void *) rd.data);
Modified: gnunet/src/namestore/test_namestore_record_serialization.c
===================================================================
--- gnunet/src/namestore/test_namestore_record_serialization.c 2012-06-19
22:01:26 UTC (rev 22124)
+++ gnunet/src/namestore/test_namestore_record_serialization.c 2012-06-19
22:17:25 UTC (rev 22125)
@@ -79,7 +79,7 @@
GNUNET_break (0);
res = 1;
}
- if (0 != GNUNET_TIME_absolute_get_difference(src[c].expiration,
dst[c].expiration).rel_value)
+ if (src[c].expiration_time != dst[c].expiration_time)
{
GNUNET_break (0);
res = 1;
Modified: gnunet/src/namestore/test_plugin_namestore.c
===================================================================
--- gnunet/src/namestore/test_plugin_namestore.c 2012-06-19 22:01:26 UTC
(rev 22124)
+++ gnunet/src/namestore/test_plugin_namestore.c 2012-06-19 22:17:25 UTC
(rev 22125)
@@ -154,7 +154,7 @@
{
rd[i].data = "Hello World";
rd[i].data_size = id % 10;
- rd[i].expiration = GNUNET_TIME_relative_to_absolute
(GNUNET_TIME_UNIT_MINUTES);
+ rd[i].expiration_time = GNUNET_TIME_relative_to_absolute
(GNUNET_TIME_UNIT_MINUTES).abs_value;
rd[i].record_type = 1 + (id % 13);
rd[i].flags = (id % 7);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22125 - gnunet/src/namestore,
gnunet <=