[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r14347 - gnunet/src/dht
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r14347 - gnunet/src/dht |
|
Date: |
Sat, 5 Feb 2011 13:10:58 +0100 |
Author: nevans
Date: 2011-02-05 13:10:58 +0100 (Sat, 05 Feb 2011)
New Revision: 14347
Modified:
gnunet/src/dht/Makefile.am
gnunet/src/dht/gnunet-dht-driver.c
gnunet/src/dht/gnunet-service-dht.c
gnunet/src/dht/test_dht_twopeer_data.conf
gnunet/src/dht/test_dht_twopeer_put_get.c
Log:
fix for block libraries so they don't need to understand dht struct
Modified: gnunet/src/dht/Makefile.am
===================================================================
--- gnunet/src/dht/Makefile.am 2011-02-04 15:42:45 UTC (rev 14346)
+++ gnunet/src/dht/Makefile.am 2011-02-05 12:10:58 UTC (rev 14347)
@@ -84,7 +84,7 @@
gnunet-service-dht \
gnunet-dht-get \
gnunet-dht-get-peer \
- gnunet-dht-put
+ gnunet-dht-put
if HAVE_MALICIOUS
noinst_PROGRAMS = \
Modified: gnunet/src/dht/gnunet-dht-driver.c
===================================================================
--- gnunet/src/dht/gnunet-dht-driver.c 2011-02-04 15:42:45 UTC (rev 14346)
+++ gnunet/src/dht/gnunet-dht-driver.c 2011-02-05 12:10:58 UTC (rev 14347)
@@ -1850,9 +1850,9 @@
GNUNET_BLOCK_TYPE_TEST,
&known_keys[test_get->uid],
get_replication,
- GNUNET_DHT_RO_NONE,
- NULL, 0,
- NULL, 0,
+ GNUNET_DHT_RO_NONE,
+ NULL, 0,
+ NULL, 0,
&get_result_iterator,
test_get);
Modified: gnunet/src/dht/gnunet-service-dht.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht.c 2011-02-04 15:42:45 UTC (rev 14346)
+++ gnunet/src/dht/gnunet-service-dht.c 2011-02-05 12:10:58 UTC (rev 14347)
@@ -2365,13 +2365,6 @@
"`%s:%s': Received `%s' response from datacache\n", my_short_id,
"DHT", "GET");
#endif
- eval = GNUNET_BLOCK_evaluate (block_context,
- type,
- key,
- &msg_ctx->reply_bf,
- msg_ctx->reply_bf_mutator,
- msg_ctx->xquery,
- msg_ctx->xquery_size, data, size);
put_entry = (const struct DHTPutEntry *)data;
@@ -2390,6 +2383,14 @@
return GNUNET_OK;
}
+ eval = GNUNET_BLOCK_evaluate (block_context,
+ type,
+ key,
+ &msg_ctx->reply_bf,
+ msg_ctx->reply_bf_mutator,
+ msg_ctx->xquery,
+ msg_ctx->xquery_size, &put_entry[1],
put_entry->data_size);
+
switch (eval)
{
case GNUNET_BLOCK_EVALUATION_OK_LAST:
@@ -2994,6 +2995,7 @@
path_offset += data_size;
memcpy(path_offset, msg_ctx->path_history, msg_ctx->path_history_len
* sizeof(struct GNUNET_PeerIdentity));
}
+
ret = GNUNET_DATACACHE_put (datacache, &msg_ctx->key, put_size,
(char *) put_entry, put_type,
GNUNET_TIME_absolute_ntoh
Modified: gnunet/src/dht/test_dht_twopeer_data.conf
===================================================================
--- gnunet/src/dht/test_dht_twopeer_data.conf 2011-02-04 15:42:45 UTC (rev
14346)
+++ gnunet/src/dht/test_dht_twopeer_data.conf 2011-02-05 12:10:58 UTC (rev
14347)
@@ -12,7 +12,7 @@
DISABLE_SOCKET_FORWARDING = YES
[block]
-plugins = test dht
+plugins = test dht dns
[dhtcache]
QUOTA = 1000000
Modified: gnunet/src/dht/test_dht_twopeer_put_get.c
===================================================================
--- gnunet/src/dht/test_dht_twopeer_put_get.c 2011-02-04 15:42:45 UTC (rev
14346)
+++ gnunet/src/dht/test_dht_twopeer_put_get.c 2011-02-05 12:10:58 UTC (rev
14347)
@@ -40,6 +40,8 @@
#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
#include "gnunet_dht_service.h"
+#include "block_dns.h"
+#include "gnunet_signatures.h"
/* DEFINES */
#define VERBOSE GNUNET_NO
@@ -53,6 +55,8 @@
/* If number of peers not in config file, use this number */
#define DEFAULT_NUM_PEERS 2
+#define DNS GNUNET_NO
+
/* Globals */
/**
@@ -106,6 +110,10 @@
/* Global return value (0 for success, anything else for failure) */
static int ok;
+#if DNS
+struct GNUNET_DNS_Record data;
+#endif
+
/**
* Peer identity of the first peer started.
*/
@@ -222,7 +230,6 @@
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received correct GET response!\n");
GNUNET_SCHEDULER_cancel(die_task);
GNUNET_DHT_get_stop(global_get_handle);
GNUNET_SCHEDULER_add_now (&finish_testing, NULL);
@@ -235,15 +242,23 @@
do_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
{
GNUNET_HashCode key; /* Key for data lookup */
+#if DNS
+ memcpy(&key, &data.service_descriptor, sizeof(GNUNET_HashCode));
+#else
memset(&key, 42, sizeof(GNUNET_HashCode)); /* Set the key to the same thing
as when data was inserted */
+#endif
global_get_handle = GNUNET_DHT_get_start(peer2dht,
GNUNET_TIME_relative_get_forever(),
- GNUNET_BLOCK_TYPE_TEST,
- &key,
- DEFAULT_GET_REPLICATION,
- GNUNET_DHT_RO_NONE,
- NULL, 0,
- NULL, 0,
- &get_result_iterator, NULL);
+#if DNS
+ GNUNET_BLOCK_TYPE_DNS,
+#else
+ GNUNET_BLOCK_TYPE_TEST,
+#endif
+ &key,
+ DEFAULT_GET_REPLICATION,
+ GNUNET_DHT_RO_NONE,
+ NULL, 0,
+ NULL, 0,
+ &get_result_iterator, NULL);
}
/**
@@ -259,6 +274,8 @@
GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS,
10), &do_get, NULL);
}
+
+#if !DNS
/**
* Set up some data, and call API PUT function
*/
@@ -274,15 +291,72 @@
GNUNET_DHT_put(peer1dht,
&key,
DEFAULT_PUT_REPLICATION,
- GNUNET_DHT_RO_NONE,
+ GNUNET_DHT_RO_NONE,
GNUNET_BLOCK_TYPE_TEST,
sizeof(data), data,
GNUNET_TIME_UNIT_FOREVER_ABS,
GNUNET_TIME_UNIT_FOREVER_REL,
&put_finished, NULL);
}
+#else
/**
+ * Set up some data, and call API PUT function
+ */
+static void
+do_put (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+{
+ char* name = "philipptoelke.gnunet.";
+ size_t size = sizeof(struct GNUNET_DNS_Record);
+ memset(&data, 0, size);
+
+ data.purpose.size = htonl(size - sizeof(struct GNUNET_CRYPTO_RsaSignature));
+ data.purpose.purpose = GNUNET_SIGNATURE_PURPOSE_DNS_RECORD;
+
+ GNUNET_CRYPTO_hash(name, strlen(name)+1, &data.service_descriptor);
+
+ data.service_type = htonl(GNUNET_DNS_SERVICE_TYPE_UDP);
+ data.ports = htons(69);
+
+ char* keyfile;
+ GNUNET_asprintf(&keyfile, "/tmp/test_dns_data_key");
+ struct GNUNET_CRYPTO_RsaPrivateKey *my_private_key =
GNUNET_CRYPTO_rsa_key_create_from_file(keyfile);
+ GNUNET_free(keyfile);
+ GNUNET_assert(my_private_key != NULL);
+
+ GNUNET_CRYPTO_rsa_key_get_public(my_private_key, &data.peer);
+
+ data.expiration_time =
GNUNET_TIME_relative_to_absolute(GNUNET_TIME_UNIT_HOURS);
+
+ /* Sign the block */
+ if (GNUNET_OK != GNUNET_CRYPTO_rsa_sign(my_private_key,
+ &data.purpose,
+ &data.signature))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "could not sign DNS_Record\n");
+ return;
+ }
+ GNUNET_CRYPTO_rsa_key_free(my_private_key);
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Putting with key %08x\n",
+ *((unsigned int*)&data.service_descriptor));
+
+ GNUNET_DHT_put(peer1dht,
+ &data.service_descriptor,
+ DEFAULT_PUT_REPLICATION,
+ GNUNET_DHT_RO_NONE,
+ GNUNET_BLOCK_TYPE_DNS,
+ size,
+ (char*)&data,
+ GNUNET_TIME_relative_to_absolute(GNUNET_TIME_UNIT_HOURS),
+ GNUNET_TIME_UNIT_MINUTES,
+ &put_finished,
+ NULL);
+}
+#endif
+
+/**
* This function is called whenever a connection attempt is finished between
two of
* the started peers (started with GNUNET_TESTING_daemons_start). The total
* number of times this function is called should equal the number returned
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r14347 - gnunet/src/dht,
gnunet <=