[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20339 - in gnunet/src: gns include namestore
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r20339 - in gnunet/src: gns include namestore |
|
Date: |
Wed, 7 Mar 2012 15:17:19 +0100 |
Author: wachs
Date: 2012-03-07 15:17:19 +0100 (Wed, 07 Mar 2012)
New Revision: 20339
Modified:
gnunet/src/gns/gnunet-gns-fcfsd.c
gnunet/src/gns/namestore_stub_api.c
gnunet/src/gns/test_gns_dht_delegated_lookup.c
gnunet/src/gns/test_gns_simple_delegated_lookup.c
gnunet/src/gns/test_gns_simple_lookup.c
gnunet/src/gns/test_gns_twopeer.c
gnunet/src/include/gnunet_namestore_service.h
gnunet/src/namestore/gnunet-namestore.c
gnunet/src/namestore/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_zone_iteration.c
gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
Log:
- reverting api change
Modified: gnunet/src/gns/gnunet-gns-fcfsd.c
===================================================================
--- gnunet/src/gns/gnunet-gns-fcfsd.c 2012-03-07 14:02:51 UTC (rev 20338)
+++ gnunet/src/gns/gnunet-gns-fcfsd.c 2012-03-07 14:17:19 UTC (rev 20339)
@@ -392,7 +392,6 @@
r.flags = htonl (GNUNET_NAMESTORE_RF_AUTHORITY);
request->qe = GNUNET_NAMESTORE_record_create (ns,
fcfs_zone_pkey,
-
GNUNET_TIME_absolute_get_forever(),
request->domain_name,
&r,
&put_continuation,
Modified: gnunet/src/gns/namestore_stub_api.c
===================================================================
--- gnunet/src/gns/namestore_stub_api.c 2012-03-07 14:02:51 UTC (rev 20338)
+++ gnunet/src/gns/namestore_stub_api.c 2012-03-07 14:17:19 UTC (rev 20339)
@@ -227,7 +227,6 @@
struct GNUNET_NAMESTORE_QueueEntry *
GNUNET_NAMESTORE_record_create (struct GNUNET_NAMESTORE_Handle *h,
const struct GNUNET_CRYPTO_RsaPrivateKey *key,
- const struct GNUNET_TIME_Absolute expire,
const char *name,
const struct GNUNET_NAMESTORE_RecordData *rd,
GNUNET_NAMESTORE_ContinuationWithStatus cont,
Modified: gnunet/src/gns/test_gns_dht_delegated_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_dht_delegated_lookup.c 2012-03-07 14:02:51 UTC
(rev 20338)
+++ gnunet/src/gns/test_gns_dht_delegated_lookup.c 2012-03-07 14:17:19 UTC
(rev 20339)
@@ -302,7 +302,6 @@
GNUNET_NAMESTORE_record_create (namestore_handle,
alice_key,
- GNUNET_TIME_absolute_get_forever(),
TEST_AUTHORITY_NAME,
&rd,
&put_dht,
Modified: gnunet/src/gns/test_gns_simple_delegated_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_delegated_lookup.c 2012-03-07 14:02:51 UTC
(rev 20338)
+++ gnunet/src/gns/test_gns_simple_delegated_lookup.c 2012-03-07 14:17:19 UTC
(rev 20339)
@@ -226,7 +226,6 @@
GNUNET_NAMESTORE_record_create (namestore_handle,
alice_key,
- GNUNET_TIME_absolute_get_forever(),
TEST_AUTHORITY_NAME,
&rd,
NULL,
Modified: gnunet/src/gns/test_gns_simple_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_lookup.c 2012-03-07 14:02:51 UTC (rev
20338)
+++ gnunet/src/gns/test_gns_simple_lookup.c 2012-03-07 14:17:19 UTC (rev
20339)
@@ -214,7 +214,6 @@
GNUNET_NAMESTORE_record_create (namestore_handle,
alice_key,
- GNUNET_TIME_absolute_get_forever(),
TEST_RECORD_NAME,
&rd,
&finish_testing,
Modified: gnunet/src/gns/test_gns_twopeer.c
===================================================================
--- gnunet/src/gns/test_gns_twopeer.c 2012-03-07 14:02:51 UTC (rev 20338)
+++ gnunet/src/gns/test_gns_twopeer.c 2012-03-07 14:17:19 UTC (rev 20339)
@@ -437,7 +437,6 @@
GNUNET_NAMESTORE_record_create (namestore_handle,
alice_key,
- GNUNET_TIME_absolute_get_forever(),
"bob",
&rd,
NULL,
@@ -446,7 +445,6 @@
rd.data = &alice_pkey;
GNUNET_NAMESTORE_record_create (namestore_handle,
bob_key,
- GNUNET_TIME_absolute_get_forever(),
"alice",
&rd,
NULL,
@@ -462,7 +460,6 @@
GNUNET_NAMESTORE_record_create (namestore_handle,
bob_key,
- GNUNET_TIME_absolute_get_forever(),
"www",
&rd,
NULL,
Modified: gnunet/src/include/gnunet_namestore_service.h
===================================================================
--- gnunet/src/include/gnunet_namestore_service.h 2012-03-07 14:02:51 UTC
(rev 20338)
+++ gnunet/src/include/gnunet_namestore_service.h 2012-03-07 14:17:19 UTC
(rev 20339)
@@ -237,7 +237,6 @@
struct GNUNET_NAMESTORE_QueueEntry *
GNUNET_NAMESTORE_record_create (struct GNUNET_NAMESTORE_Handle *h,
const struct GNUNET_CRYPTO_RsaPrivateKey *pkey,
- const struct GNUNET_TIME_Absolute expire,
const char *name,
const struct GNUNET_NAMESTORE_RecordData *rd,
GNUNET_NAMESTORE_ContinuationWithStatus cont,
Modified: gnunet/src/namestore/gnunet-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-namestore.c 2012-03-07 14:02:51 UTC (rev
20338)
+++ gnunet/src/namestore/gnunet-namestore.c 2012-03-07 14:17:19 UTC (rev
20339)
@@ -104,10 +104,6 @@
*/
static char *expirationstring;
-/**
- * Desired block expiration time.
- */
-static char *blockexpirationstring;
/**
* Task run on shutdown. Cleans up everything.
@@ -261,7 +257,6 @@
void *data = NULL;
size_t data_size = 0;
struct GNUNET_TIME_Relative etime;
- struct GNUNET_TIME_Relative btime;
struct GNUNET_NAMESTORE_RecordData rd;
if (NULL == keyfile)
@@ -359,27 +354,6 @@
GNUNET_SCHEDULER_shutdown ();
return;
}
- if (NULL != blockexpirationstring)
- {
- if (GNUNET_OK !=
- GNUNET_STRINGS_fancy_time_to_relative (blockexpirationstring,
- &btime))
- {
- fprintf (stderr,
- _("Invalid time format `%s'\n"),
- blockexpirationstring);
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
- } else if (add | del)
- {
- fprintf (stderr,
- _("Missing option `%s' for operation `%s'\n"),
- "-b", _("add/del"));
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
-
if (add)
{
if (NULL == name)
@@ -397,7 +371,6 @@
rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY; // FIXME: not always...
add_qe = GNUNET_NAMESTORE_record_create (ns,
zone_pkey,
- GNUNET_TIME_relative_to_absolute
(btime),
name,
&rd,
&add_continuation,
@@ -451,9 +424,6 @@
{'a', "add", NULL,
gettext_noop ("add record"), 0,
&GNUNET_GETOPT_set_one, &add},
- {'b', "name-expiration", "TIME",
- gettext_noop ("expiration time for name to use (for adding only)"), 1,
- &GNUNET_GETOPT_set_string, &blockexpirationstring},
{'d', "delete", NULL,
gettext_noop ("delete record"), 0,
&GNUNET_GETOPT_set_one, &del},
Modified: gnunet/src/namestore/namestore_api.c
===================================================================
--- gnunet/src/namestore/namestore_api.c 2012-03-07 14:02:51 UTC (rev
20338)
+++ gnunet/src/namestore/namestore_api.c 2012-03-07 14:17:19 UTC (rev
20339)
@@ -1105,7 +1105,6 @@
struct GNUNET_NAMESTORE_QueueEntry *
GNUNET_NAMESTORE_record_create (struct GNUNET_NAMESTORE_Handle *h,
const struct GNUNET_CRYPTO_RsaPrivateKey *pkey,
- const struct GNUNET_TIME_Absolute expire,
const char *name,
const struct GNUNET_NAMESTORE_RecordData *rd,
GNUNET_NAMESTORE_ContinuationWithStatus cont,
@@ -1171,7 +1170,7 @@
msg->rd_count = htons (1);
msg->rd_len = htons (rd_ser_len);
msg->pkey_len = htons (key_len);
- msg->expire = GNUNET_TIME_absolute_hton(expire);
+ msg->expire = GNUNET_TIME_absolute_hton(GNUNET_TIME_absolute_get_forever());
memcpy (pkey_tmp, pkey_enc, key_len);
memcpy (name_tmp, name, name_len);
memcpy (rd_tmp, rd_ser, rd_ser_len);
Modified: gnunet/src/namestore/test_namestore_api_create.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_create.c 2012-03-07 14:02:51 UTC
(rev 20338)
+++ gnunet/src/namestore/test_namestore_api_create.c 2012-03-07 14:17:19 UTC
(rev 20339)
@@ -301,7 +301,7 @@
s_second_record->data_size = TEST_CREATE_RECORD_DATALEN;
memset ((char *) s_second_record->data, TEST_CREATE_RECORD_DATA,
TEST_CREATE_RECORD_DATALEN);
- GNUNET_NAMESTORE_record_create (nsh, privkey,
GNUNET_TIME_absolute_get_forever(), name, s_second_record, &create_second_cont,
name);
+ GNUNET_NAMESTORE_record_create (nsh, privkey, name, s_second_record,
&create_second_cont, name);
}
else
@@ -430,7 +430,7 @@
GNUNET_break (s_name != NULL);
/* create initial record */
- GNUNET_NAMESTORE_record_create (nsh, privkey,
GNUNET_TIME_absolute_get_forever(), s_name, s_first_record, &create_first_cont,
s_name);
+ GNUNET_NAMESTORE_record_create (nsh, privkey, s_name, s_first_record,
&create_first_cont, s_name);
}
static int
Modified: gnunet/src/namestore/test_namestore_api_create_update.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_create_update.c 2012-03-07
14:02:51 UTC (rev 20338)
+++ gnunet/src/namestore/test_namestore_api_create_update.c 2012-03-07
14:17:19 UTC (rev 20339)
@@ -301,7 +301,7 @@
s_second_record->data_size = TEST_CREATE_RECORD_DATALEN;
memset ((char *) s_second_record->data, TEST_CREATE_RECORD_DATA,
TEST_CREATE_RECORD_DATALEN);
- GNUNET_NAMESTORE_record_create (nsh, privkey,
GNUNET_TIME_absolute_get_forever(), name, s_second_record, &create_second_cont,
name);
+ GNUNET_NAMESTORE_record_create (nsh, privkey, name, s_second_record,
&create_second_cont, name);
}
else
@@ -349,7 +349,7 @@
{
res = 0;
s_first_record->expiration = GNUNET_TIME_absolute_get ();
- GNUNET_NAMESTORE_record_create (nsh, privkey,
GNUNET_TIME_absolute_get_forever(), s_name, s_first_record,
&create_updated_cont, s_name);
+ GNUNET_NAMESTORE_record_create (nsh, privkey, s_name, s_first_record,
&create_updated_cont, s_name);
}
else
{
@@ -369,7 +369,7 @@
{
res = 0;
/* check if record was created correct */
- GNUNET_NAMESTORE_record_create (nsh, privkey,
GNUNET_TIME_absolute_get_forever(), s_name, s_first_record,
&create_identical_cont, s_name);
+ GNUNET_NAMESTORE_record_create (nsh, privkey, s_name, s_first_record,
&create_identical_cont, s_name);
}
else
{
@@ -474,7 +474,7 @@
GNUNET_break (s_name != NULL);
/* create initial record */
- GNUNET_NAMESTORE_record_create (nsh, privkey,
GNUNET_TIME_absolute_get_forever(), s_name, s_first_record, &create_first_cont,
s_name);
+ GNUNET_NAMESTORE_record_create (nsh, privkey, s_name, s_first_record,
&create_first_cont, s_name);
}
static int
Modified: gnunet/src/namestore/test_namestore_api_zone_iteration.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration.c 2012-03-07
14:02:51 UTC (rev 20338)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration.c 2012-03-07
14:17:19 UTC (rev 20339)
@@ -409,7 +409,7 @@
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);
- GNUNET_NAMESTORE_record_create(nsh, privkey,
GNUNET_TIME_absolute_get_forever(), s_name_1, s_rd_1, &put_cont, NULL);
+ 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");
@@ -417,7 +417,7 @@
s_rd_2 = create_record(1);
sig_2 = GNUNET_NAMESTORE_create_signature(privkey, s_name_2, s_rd_2, 1);
- GNUNET_NAMESTORE_record_create(nsh, privkey,
GNUNET_TIME_absolute_get_forever(), s_name_2, s_rd_2, &put_cont, NULL);
+ 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 */
Modified: gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
2012-03-07 14:02:51 UTC (rev 20338)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
2012-03-07 14:17:19 UTC (rev 20339)
@@ -390,7 +390,7 @@
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);
- GNUNET_NAMESTORE_record_create(nsh, privkey,
GNUNET_TIME_absolute_get_forever(), s_name_1, s_rd_1, &put_cont, NULL);
+ 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");
@@ -398,7 +398,7 @@
s_rd_2 = create_record(1);
sig_2 = GNUNET_NAMESTORE_create_signature(privkey, s_name_2, s_rd_2, 1);
- GNUNET_NAMESTORE_record_create(nsh, privkey,
GNUNET_TIME_absolute_get_forever(), s_name_2, s_rd_2, &put_cont, NULL);
+ 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 */
Modified: gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
2012-03-07 14:02:51 UTC (rev 20338)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
2012-03-07 14:17:19 UTC (rev 20339)
@@ -430,7 +430,7 @@
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);
- GNUNET_NAMESTORE_record_create(nsh, privkey,
GNUNET_TIME_absolute_get_forever(), s_name_1, s_rd_1, &put_cont, NULL);
+ 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");
@@ -438,7 +438,7 @@
s_rd_2 = create_record(1);
sig_2 = GNUNET_NAMESTORE_create_signature(privkey, s_name_2, s_rd_2, 1);
- GNUNET_NAMESTORE_record_create(nsh,
privkey,GNUNET_TIME_absolute_get_forever(), s_name_2, s_rd_2, &put_cont, NULL);
+ 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 */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20339 - in gnunet/src: gns include namestore,
gnunet <=