[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21336 - gnunet/src/gns
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21336 - gnunet/src/gns |
Date: |
Tue, 8 May 2012 12:46:33 +0200 |
Author: schanzen
Date: 2012-05-08 12:46:33 +0200 (Tue, 08 May 2012)
New Revision: 21336
Modified:
gnunet/src/gns/gns.conf.in
gnunet/src/gns/gnunet-service-gns.c
Log:
-do not hijack dns by default
-iterate over all authoritative zones
Modified: gnunet/src/gns/gns.conf.in
===================================================================
--- gnunet/src/gns/gns.conf.in 2012-05-08 09:45:08 UTC (rev 21335)
+++ gnunet/src/gns/gns.conf.in 2012-05-08 10:46:33 UTC (rev 21336)
@@ -6,7 +6,7 @@
BINARY = gnunet-service-gns
UNIXPATH = /tmp/gnunet-service-gns.sock
ZONEKEY = $SERVICEHOME/gns/zonekey.zkey
-HIJACK_DNS = YES
+HIJACK_DNS = NO
AUTO_IMPORT_PKEY = YES
AUTO_IMPORT_CONFIRMATION_REQ = NO
MAX_PARALLEL_BACKGROUND_QUERIES = 25
Modified: gnunet/src/gns/gnunet-service-gns.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns.c 2012-05-08 09:45:08 UTC (rev 21335)
+++ gnunet/src/gns/gnunet-service-gns.c 2012-05-08 10:46:33 UTC (rev 21336)
@@ -251,10 +251,10 @@
struct GNSNameRecordBlock *nrb;
struct GNUNET_CRYPTO_ShortHashCode name_hash;
+ struct GNUNET_CRYPTO_ShortHashCode zhash;
GNUNET_HashCode xor_hash;
GNUNET_HashCode name_hash_double;
GNUNET_HashCode zone_hash_double;
- struct GNUNET_CRYPTO_HashAsciiEncoded xor_hash_string;
uint32_t rd_payload_length;
char* nrb_data = NULL;
size_t namelen;
@@ -326,15 +326,20 @@
/*
* calculate DHT key: H(name) xor H(pubkey)
*/
+ GNUNET_CRYPTO_short_hash(key,
+ sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ &zhash);
GNUNET_CRYPTO_short_hash(name, strlen(name), &name_hash);
GNUNET_CRYPTO_short_hash_double (&name_hash, &name_hash_double);
- GNUNET_CRYPTO_short_hash_double (&zone_hash, &zone_hash_double);
+ GNUNET_CRYPTO_short_hash_double (&zhash, &zone_hash_double);
GNUNET_CRYPTO_hash_xor(&zone_hash_double, &name_hash_double, &xor_hash);
- GNUNET_CRYPTO_hash_to_enc (&xor_hash, &xor_hash_string);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "zone identity: %s\n", GNUNET_h2s (&zone_hash_double));
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"putting records for %s under key: %s with size %d\n",
- name, (char*)&xor_hash_string, rd_payload_length);
+ name, GNUNET_h2s (&xor_hash), rd_payload_length);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"DHT req to %d\n", DHT_OPERATION_TIMEOUT.rel_value);
@@ -404,7 +409,7 @@
/* start counting again */
num_public_records = 0;
namestore_iter = GNUNET_NAMESTORE_zone_iteration_start (namestore_handle,
- &zone_hash,
+ NULL, //All zones
GNUNET_NAMESTORE_RF_AUTHORITY,
GNUNET_NAMESTORE_RF_PRIVATE,
&put_gns_record,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21336 - gnunet/src/gns,
gnunet <=