[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25205 - in gnunet/src: gns include
From: |
gnunet |
Subject: |
[GNUnet-SVN] r25205 - in gnunet/src: gns include |
Date: |
Mon, 3 Dec 2012 20:00:56 +0100 |
Author: grothoff
Date: 2012-12-03 20:00:56 +0100 (Mon, 03 Dec 2012)
New Revision: 25205
Modified:
gnunet/src/gns/gnunet-service-gns_resolver.c
gnunet/src/gns/test_gns_dht_three_peers.c
gnunet/src/gns/test_gns_pseu_shorten.c
gnunet/src/gns/test_gns_revocation.c
gnunet/src/gns/test_gns_simple_mx_lookup.c
gnunet/src/include/gnunet_gns_service.h
Log:
-introduce #define for + in GADS
Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c 2012-12-03 17:31:48 UTC
(rev 25204)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c 2012-12-03 19:00:56 UTC
(rev 25205)
@@ -433,7 +433,7 @@
{
for (i=0; i < num_records; i++)
{
- if ((strcmp (name, "+") == 0) &&
+ if ((strcmp (name, GNUNET_GNS_MASTERZONE_STR) == 0) &&
(rd[i].record_type == GNUNET_GNS_RECORD_PSEU))
{
/* found pseu */
@@ -549,7 +549,7 @@
{
gph->namestore_task = GNUNET_NAMESTORE_lookup_record (namestore_handle,
&gph->auth->zone,
- "+",
+ GNUNET_GNS_MASTERZONE_STR,
GNUNET_GNS_RECORD_PSEU,
&process_auth_discovery_ns_result,
gph);
@@ -2303,7 +2303,7 @@
/* Check for key revocation and delegate */
rh->namestore_task = GNUNET_NAMESTORE_lookup_record (namestore_handle,
&rh->authority,
- "+",
+ GNUNET_GNS_MASTERZONE_STR,
GNUNET_GNS_RECORD_REV,
&process_pkey_revocation_result_ns,
rh);
@@ -2444,7 +2444,7 @@
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_POSTPROCESS: Postprocessing\n");
- if (0 == strcmp(rh->name, "+"))
+ if (0 == strcmp(rh->name, GNUNET_GNS_MASTERZONE_STR))
repl_string = rlh->name;
else
repl_string = rlh->name+strlen(rh->name)+1;
@@ -2604,7 +2604,7 @@
check_dht = GNUNET_NO;
}
- if ((0 != strcmp (rh->name, "+")) && (GNUNET_YES == is_srv (rh->name)))
+ if ((0 != strcmp (rh->name, GNUNET_GNS_MASTERZONE_STR)) && (GNUNET_YES ==
is_srv (rh->name)))
check_dht = GNUNET_NO;
if (GNUNET_YES == rh->only_cached)
@@ -3226,7 +3226,7 @@
/* Check for key revocation and delegate */
rh->namestore_task = GNUNET_NAMESTORE_lookup_record (namestore_handle,
&rh->authority,
- "+",
+
GNUNET_GNS_MASTERZONE_STR,
GNUNET_GNS_RECORD_REV,
&process_pkey_revocation_result_ns,
rh);
Modified: gnunet/src/gns/test_gns_dht_three_peers.c
===================================================================
--- gnunet/src/gns/test_gns_dht_three_peers.c 2012-12-03 17:31:48 UTC (rev
25204)
+++ gnunet/src/gns/test_gns_dht_three_peers.c 2012-12-03 19:00:56 UTC (rev
25205)
@@ -343,7 +343,7 @@
rd.record_type = GNUNET_GNS_RECORD_PSEU;
- GNUNET_NAMESTORE_record_create (nh[0], key, "+", &rd, &cont_ns, nh[0]);
+ GNUNET_NAMESTORE_record_create (nh[0], key, GNUNET_GNS_MASTERZONE_STR, &rd,
&cont_ns, nh[0]);
GNUNET_CRYPTO_rsa_key_free(key);
GNUNET_free(keyfile);
Modified: gnunet/src/gns/test_gns_pseu_shorten.c
===================================================================
--- gnunet/src/gns/test_gns_pseu_shorten.c 2012-12-03 17:31:48 UTC (rev
25204)
+++ gnunet/src/gns/test_gns_pseu_shorten.c 2012-12-03 19:00:56 UTC (rev
25205)
@@ -279,27 +279,27 @@
sig = GNUNET_NAMESTORE_create_signature(alice_key,
GNUNET_TIME_UNIT_FOREVER_ABS,
- "+",
+ GNUNET_GNS_MASTERZONE_STR,
&rd, 1);
GNUNET_assert (NULL != sig);
GNUNET_break (GNUNET_OK == GNUNET_NAMESTORE_verify_signature (&alice_pkey,
GNUNET_TIME_UNIT_FOREVER_ABS,
- "+",
+
GNUNET_GNS_MASTERZONE_STR,
1,
&rd,
sig));
rd_payload_length = GNUNET_NAMESTORE_records_get_size (1, &rd);
- nrb = GNUNET_malloc(rd_payload_length + strlen("+") + 1
+ nrb = GNUNET_malloc(rd_payload_length + strlen(GNUNET_GNS_MASTERZONE_STR) + 1
+ sizeof(struct GNSNameRecordBlock));
nrb->signature = *sig;
nrb->public_key = alice_pkey;
nrb->rd_count = htonl(1);
- memset(&nrb[1], 0, strlen("+") + 1);
- strcpy((char*)&nrb[1], "+");
+ memset(&nrb[1], 0, strlen(GNUNET_GNS_MASTERZONE_STR) + 1);
+ strcpy((char*)&nrb[1], GNUNET_GNS_MASTERZONE_STR);
nrb_data = (char*)&nrb[1];
- nrb_data += strlen("+") + 1;
+ nrb_data += strlen(GNUNET_GNS_MASTERZONE_STR) + 1;
if (-1 == GNUNET_NAMESTORE_records_serialize (1,
&rd,
@@ -316,7 +316,7 @@
end_badly_now ();
return;
}
- GNUNET_CRYPTO_short_hash("+", strlen("+"), &name_hash);
+ GNUNET_CRYPTO_short_hash(GNUNET_GNS_MASTERZONE_STR,
strlen(GNUNET_GNS_MASTERZONE_STR), &name_hash);
GNUNET_CRYPTO_short_hash(&alice_pkey,
sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
&zone_hash);
@@ -326,7 +326,7 @@
GNUNET_CRYPTO_hash_xor(&zone_hash_double, &name_hash_double, &xor_hash);
rd_payload_length += sizeof(struct GNSNameRecordBlock) +
- strlen("+") + 1;
+ strlen(GNUNET_GNS_MASTERZONE_STR) + 1;
GNUNET_DHT_put (dht_handle, &xor_hash,
0,
Modified: gnunet/src/gns/test_gns_revocation.c
===================================================================
--- gnunet/src/gns/test_gns_revocation.c 2012-12-03 17:31:48 UTC (rev
25204)
+++ gnunet/src/gns/test_gns_revocation.c 2012-12-03 19:00:56 UTC (rev
25205)
@@ -257,7 +257,7 @@
GNUNET_NAMESTORE_record_create (namestore_handle,
bob_key,
- "+",
+ GNUNET_GNS_MASTERZONE_STR,
&rd,
&commence_testing,
NULL);
Modified: gnunet/src/gns/test_gns_simple_mx_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_mx_lookup.c 2012-12-03 17:31:48 UTC (rev
25204)
+++ gnunet/src/gns/test_gns_simple_mx_lookup.c 2012-12-03 19:00:56 UTC (rev
25205)
@@ -265,12 +265,12 @@
rd.record_type = GNUNET_GNS_RECORD_MX;
sig = GNUNET_NAMESTORE_create_signature(bob_key,
GNUNET_TIME_UNIT_FOREVER_ABS,
- "+",
+ GNUNET_GNS_MASTERZONE_STR,
&rd, 1);
et.abs_value = rd.expiration_time;
GNUNET_NAMESTORE_record_put (namestore_handle,
&bob_pkey,
- "+",
+ GNUNET_GNS_MASTERZONE_STR,
et,
1,
&rd,
Modified: gnunet/src/include/gnunet_gns_service.h
===================================================================
--- gnunet/src/include/gnunet_gns_service.h 2012-12-03 17:31:48 UTC (rev
25204)
+++ gnunet/src/include/gnunet_gns_service.h 2012-12-03 19:00:56 UTC (rev
25205)
@@ -40,6 +40,12 @@
/**
+ * String we use to indicate the local master zone or a
+ * root entry in the current zone.
+ */
+#define GNUNET_GNS_MASTERZONE_STR "+"
+
+/**
* Connection to the GNS service.
*/
struct GNUNET_GNS_Handle;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25205 - in gnunet/src: gns include,
gnunet <=