[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29033 - in gnunet/src: gns include namestore
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r29033 - in gnunet/src: gns include namestore |
|
Date: |
Thu, 5 Sep 2013 16:28:44 +0200 |
Author: grothoff
Date: 2013-09-05 16:28:43 +0200 (Thu, 05 Sep 2013)
New Revision: 29033
Modified:
gnunet/src/gns/gnunet-service-gns.c
gnunet/src/gns/gnunet-service-gns_interceptor.c
gnunet/src/gns/gnunet-service-gns_resolver.c
gnunet/src/gns/gnunet-service-gns_shorten.c
gnunet/src/gns/test_gns_cname_lookup.c
gnunet/src/gns/test_gns_dht_delegated_lookup.c
gnunet/src/gns/test_gns_dht_three_peers.c
gnunet/src/gns/test_gns_max_queries.c
gnunet/src/gns/test_gns_ns_lookup.c
gnunet/src/gns/test_gns_pseu_shorten.c
gnunet/src/gns/test_gns_revocation.c
gnunet/src/gns/test_gns_simple_delegated_lookup.c
gnunet/src/gns/test_gns_simple_lookup.c
gnunet/src/gns/test_gns_simple_mx_lookup.c
gnunet/src/gns/test_gns_simple_shorten.c
gnunet/src/gns/test_gns_simple_srv_lookup.c
gnunet/src/gns/test_gns_simple_zkey_lookup.c
gnunet/src/include/gnunet_namestore_service.h
gnunet/src/namestore/gnunet-namestore-fcfsd.c
gnunet/src/namestore/gnunet-namestore.c
gnunet/src/namestore/test_namestore_api_create.c
Log:
-remove deprecated GNUNET_NAMESTORE_RF_AUTHORITY
Modified: gnunet/src/gns/gnunet-service-gns.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns.c 2013-09-05 14:21:01 UTC (rev 29032)
+++ gnunet/src/gns/gnunet-service-gns.c 2013-09-05 14:28:43 UTC (rev 29033)
@@ -19,7 +19,7 @@
*/
/**
* @file gns/gnunet-service-gns.c
- * @brief GNUnet GNS service
+ * @brief GNU Name System (main service)
* @author Martin Schanzenbach
* @author Christian Grothoff
*/
@@ -472,7 +472,7 @@
* Reply to client with the result from our lookup.
*
* @param cls the closure (our client lookup handle)
- * @param rd_count the number of records
+ * @param rd_count the number of records in @a rd
* @param rd the record data
*/
static void
Modified: gnunet/src/gns/gnunet-service-gns_interceptor.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_interceptor.c 2013-09-05 14:21:01 UTC
(rev 29032)
+++ gnunet/src/gns/gnunet-service-gns_interceptor.c 2013-09-05 14:28:43 UTC
(rev 29033)
@@ -22,9 +22,6 @@
* @brief GNUnet GNS interceptor logic
* @author Martin Schanzenbach
* @author Christian Grothoff
- *
- * TODO:
- * - implement RF_SHADOW_RECORD logic
*/
#include "platform.h"
#include "gnunet_util_lib.h"
Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c 2013-09-05 14:21:01 UTC
(rev 29032)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c 2013-09-05 14:28:43 UTC
(rev 29033)
@@ -20,7 +20,7 @@
/**
* @file gns/gnunet-service-gns_resolver.c
- * @brief GNUnet GNS resolver logic
+ * @brief GNU Name System resolver logic
* @author Martin Schanzenbach
* @author Christian Grothoff
*
Modified: gnunet/src/gns/gnunet-service-gns_shorten.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_shorten.c 2013-09-05 14:21:01 UTC (rev
29032)
+++ gnunet/src/gns/gnunet-service-gns_shorten.c 2013-09-05 14:28:43 UTC (rev
29033)
@@ -290,7 +290,7 @@
new_pkey.data_size = sizeof (struct GNUNET_CRYPTO_EccPublicKey);
new_pkey.data = &gph->target_zone;
new_pkey.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
- new_pkey.flags = GNUNET_NAMESTORE_RF_AUTHORITY
+ new_pkey.flags = GNUNET_NAMESTORE_RF_NONE
| GNUNET_NAMESTORE_RF_PRIVATE
| GNUNET_NAMESTORE_RF_PENDING;
gph->namestore_task
Modified: gnunet/src/gns/test_gns_cname_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_cname_lookup.c 2013-09-05 14:21:01 UTC (rev
29032)
+++ gnunet/src/gns/test_gns_cname_lookup.c 2013-09-05 14:28:43 UTC (rev
29033)
@@ -376,7 +376,7 @@
rd.data_size = sizeof(struct in_addr);
rd.data = &web;
rd.record_type = GNUNET_DNSPARSER_TYPE_A;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
alice_key,
Modified: gnunet/src/gns/test_gns_dht_delegated_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_dht_delegated_lookup.c 2013-09-05 14:21:01 UTC
(rev 29032)
+++ gnunet/src/gns/test_gns_dht_delegated_lookup.c 2013-09-05 14:28:43 UTC
(rev 29033)
@@ -226,7 +226,7 @@
rd.data_size = sizeof(struct in_addr);
rd.data = web;
rd.record_type = GNUNET_DNSPARSER_TYPE_A;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
sig = GNUNET_NAMESTORE_create_signature(bob_key,
GNUNET_TIME_UNIT_FOREVER_ABS, TEST_RECORD_NAME,
&rd, 1);
@@ -344,7 +344,7 @@
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &bob_hash;
rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
alice_key,
Modified: gnunet/src/gns/test_gns_dht_three_peers.c
===================================================================
--- gnunet/src/gns/test_gns_dht_three_peers.c 2013-09-05 14:21:01 UTC (rev
29032)
+++ gnunet/src/gns/test_gns_dht_three_peers.c 2013-09-05 14:28:43 UTC (rev
29033)
@@ -354,7 +354,7 @@
rd.data_size = sizeof(struct in_addr);
rd.data = web;
rd.record_type = GNUNET_DNSPARSER_TYPE_A;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (nh[0], key, "www",
1, &rd,
@@ -422,7 +422,7 @@
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &dave_hash;
rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (nh[1], key, "buddy",
1, &rd,
@@ -474,7 +474,7 @@
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &bob_hash;
rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (nh[2], key, "bob",
1, &rd,
Modified: gnunet/src/gns/test_gns_max_queries.c
===================================================================
--- gnunet/src/gns/test_gns_max_queries.c 2013-09-05 14:21:01 UTC (rev
29032)
+++ gnunet/src/gns/test_gns_max_queries.c 2013-09-05 14:28:43 UTC (rev
29033)
@@ -308,7 +308,7 @@
rd.data_size = sizeof(struct in_addr);
rd.data = web;
rd.record_type = GNUNET_DNSPARSER_TYPE_A;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
alice_key,
Modified: gnunet/src/gns/test_gns_ns_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_ns_lookup.c 2013-09-05 14:21:01 UTC (rev 29032)
+++ gnunet/src/gns/test_gns_ns_lookup.c 2013-09-05 14:28:43 UTC (rev 29033)
@@ -603,13 +603,13 @@
rd[0].data_size = sizeof (struct in_addr);
rd[0].data = &ns;
rd[0].record_type = GNUNET_DNSPARSER_TYPE_A;
- rd[0].flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd[0].flags = GNUNET_NAMESTORE_RF_NONE;
rd[1].expiration_time = UINT64_MAX;
rd[1].data_size = strlen (TEST_RECORD_NS);
rd[1].data = TEST_RECORD_NS;
rd[1].record_type = GNUNET_DNSPARSER_TYPE_NS;
- rd[1].flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd[1].flags = GNUNET_NAMESTORE_RF_NONE;
qe = GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
alice_key,
Modified: gnunet/src/gns/test_gns_pseu_shorten.c
===================================================================
--- gnunet/src/gns/test_gns_pseu_shorten.c 2013-09-05 14:21:01 UTC (rev
29032)
+++ gnunet/src/gns/test_gns_pseu_shorten.c 2013-09-05 14:28:43 UTC (rev
29033)
@@ -363,7 +363,7 @@
rd.data_size = sizeof(struct in_addr);
rd.data = web;
rd.record_type = GNUNET_DNSPARSER_TYPE_A;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
sig = GNUNET_NAMESTORE_create_signature(alice_key,
GNUNET_TIME_UNIT_FOREVER_ABS,
@@ -448,7 +448,7 @@
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &alice_hash;
rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
sig = GNUNET_NAMESTORE_create_signature (bob_key,
GNUNET_TIME_UNIT_FOREVER_ABS,
@@ -519,7 +519,7 @@
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &bob_hash;
rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
our_key,
@@ -540,7 +540,7 @@
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &short_zone;
rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
priv_key,
@@ -641,7 +641,7 @@
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &priv_zone;
rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
our_key,
Modified: gnunet/src/gns/test_gns_revocation.c
===================================================================
--- gnunet/src/gns/test_gns_revocation.c 2013-09-05 14:21:01 UTC (rev
29032)
+++ gnunet/src/gns/test_gns_revocation.c 2013-09-05 14:28:43 UTC (rev
29033)
@@ -227,7 +227,7 @@
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &bob_hash;
rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
alice_key,
Modified: gnunet/src/gns/test_gns_simple_delegated_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_delegated_lookup.c 2013-09-05 14:21:01 UTC
(rev 29032)
+++ gnunet/src/gns/test_gns_simple_delegated_lookup.c 2013-09-05 14:28:43 UTC
(rev 29033)
@@ -233,7 +233,7 @@
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &bob_hash;
rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
alice_key,
TEST_AUTHORITY_NAME,
Modified: gnunet/src/gns/test_gns_simple_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_lookup.c 2013-09-05 14:21:01 UTC (rev
29032)
+++ gnunet/src/gns/test_gns_simple_lookup.c 2013-09-05 14:28:43 UTC (rev
29033)
@@ -259,7 +259,7 @@
rd.data_size = sizeof(struct in_addr);
rd.data = &web;
rd.record_type = GNUNET_DNSPARSER_TYPE_A;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
nsqe = GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
alice_key,
TEST_RECORD_NAME,
Modified: gnunet/src/gns/test_gns_simple_mx_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_mx_lookup.c 2013-09-05 14:21:01 UTC (rev
29032)
+++ gnunet/src/gns/test_gns_simple_mx_lookup.c 2013-09-05 14:28:43 UTC (rev
29033)
@@ -229,7 +229,7 @@
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &bob_hash;
rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
alice_key,
Modified: gnunet/src/gns/test_gns_simple_shorten.c
===================================================================
--- gnunet/src/gns/test_gns_simple_shorten.c 2013-09-05 14:21:01 UTC (rev
29032)
+++ gnunet/src/gns/test_gns_simple_shorten.c 2013-09-05 14:28:43 UTC (rev
29033)
@@ -257,7 +257,7 @@
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &bob_hash;
rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
/* put bob into our zone */
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
Modified: gnunet/src/gns/test_gns_simple_srv_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_srv_lookup.c 2013-09-05 14:21:01 UTC (rev
29032)
+++ gnunet/src/gns/test_gns_simple_srv_lookup.c 2013-09-05 14:28:43 UTC (rev
29033)
@@ -235,7 +235,7 @@
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &bob_hash;
rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
alice_key,
Modified: gnunet/src/gns/test_gns_simple_zkey_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_zkey_lookup.c 2013-09-05 14:21:01 UTC
(rev 29032)
+++ gnunet/src/gns/test_gns_simple_zkey_lookup.c 2013-09-05 14:28:43 UTC
(rev 29033)
@@ -244,7 +244,7 @@
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &bob_hash;
rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
alice_key,
Modified: gnunet/src/include/gnunet_namestore_service.h
===================================================================
--- gnunet/src/include/gnunet_namestore_service.h 2013-09-05 14:21:01 UTC
(rev 29032)
+++ gnunet/src/include/gnunet_namestore_service.h 2013-09-05 14:28:43 UTC
(rev 29033)
@@ -144,14 +144,6 @@
GNUNET_NAMESTORE_RF_NONE = 0,
/**
- * This peer is the authority for this record; it must thus
- * not be deleted (other records can be deleted if we run
- * out of space).
- * @deprecated
- */
- GNUNET_NAMESTORE_RF_AUTHORITY = 1,
-
- /**
* This is a private record of this peer and it should
* thus not be handed out to other peers.
*/
Modified: gnunet/src/namestore/gnunet-namestore-fcfsd.c
===================================================================
--- gnunet/src/namestore/gnunet-namestore-fcfsd.c 2013-09-05 14:21:01 UTC
(rev 29032)
+++ gnunet/src/namestore/gnunet-namestore-fcfsd.c 2013-09-05 14:28:43 UTC
(rev 29033)
@@ -525,7 +525,7 @@
r.data_size = sizeof (pub);
r.expiration_time = UINT64_MAX;
r.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
- r.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ r.flags = GNUNET_NAMESTORE_RF_NONE;
request->qe = GNUNET_NAMESTORE_records_store (ns,
&fcfs_zone_pkey,
request->domain_name,
Modified: gnunet/src/namestore/gnunet-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-namestore.c 2013-09-05 14:21:01 UTC (rev
29032)
+++ gnunet/src/namestore/gnunet-namestore.c 2013-09-05 14:28:43 UTC (rev
29033)
@@ -24,7 +24,6 @@
* @author Christian Grothoff
*
* TODO:
- * - allow users to set record options (not just 'RF_AUTHORITY')
* - test
* - add options to list/lookup individual records
*/
@@ -91,14 +90,14 @@
static int del;
/**
- * Is record public
+ * Is record public (opposite of #GNUNET_NAMESTORE_RF_PRIVATE)
*/
static int public;
/**
- * Is record authority
+ * Is record a shadow record (#GNUNET_NAMESTORE_RF_SHADOW_RECORD)
*/
-static int nonauthority;
+static int shadow;
/**
* Queue entry for the 'del' operation.
@@ -398,8 +397,8 @@
rde->data = data;
rde->data_size = data_size;
rde->record_type = type;
- if (1 != nonauthority)
- rde->flags |= GNUNET_NAMESTORE_RF_AUTHORITY;
+ if (1 != shadow)
+ rde->flags |= GNUNET_NAMESTORE_RF_SHADOW_RECORD;
if (1 != public)
rde->flags |= GNUNET_NAMESTORE_RF_PRIVATE;
GNUNET_assert (NULL != name);
@@ -602,8 +601,8 @@
rd.expiration_time = etime_abs.abs_value_us;
else
rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
- if (1 != nonauthority)
- rd.flags |= GNUNET_NAMESTORE_RF_AUTHORITY;
+ if (1 != shadow)
+ rd.flags |= GNUNET_NAMESTORE_RF_SHADOW_RECORD;
add_qe_uri = GNUNET_NAMESTORE_records_store (ns,
&zone_pkey,
sname,
@@ -727,9 +726,9 @@
{'p', "public", NULL,
gettext_noop ("create or list public record"), 0,
&GNUNET_GETOPT_set_one, &public},
- {'N', "non-authority", NULL,
- gettext_noop ("create or list non-authority record"), 0,
- &GNUNET_GETOPT_set_one, &nonauthority},
+ {'s', "shadow", NULL,
+ gettext_noop ("create shadow record (only valid if all other records of
the same type have expired"), 0,
+ &GNUNET_GETOPT_set_one, &shadow},
{'z', "zone", "EGO",
gettext_noop ("name of the ego controlling the zone"), 1,
&GNUNET_GETOPT_set_string, &ego_name},
Modified: gnunet/src/namestore/test_namestore_api_create.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_create.c 2013-09-05 14:21:01 UTC
(rev 29032)
+++ gnunet/src/namestore/test_namestore_api_create.c 2013-09-05 14:28:43 UTC
(rev 29033)
@@ -262,7 +262,7 @@
s_second_record = GNUNET_malloc (sizeof (struct
GNUNET_NAMESTORE_RecordData) + TEST_CREATE_RECORD_DATALEN);
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->flags = GNUNET_NAMESTORE_RF_NONE;
s_second_record->data = &s_second_record[1];
s_second_record->data_size = TEST_CREATE_RECORD_DATALEN;
memset ((char *) s_second_record->data, TEST_CREATE_RECORD_DATA,
TEST_CREATE_RECORD_DATALEN);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29033 - in gnunet/src: gns include namestore,
gnunet <=