#include "block_gns.h"
#include "gns.h"
+#define DHT_OPERATION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+#define DHT_LOOKUP_TIMEOUT DHT_OPERATION_TIMEOUT
+#define DHT_GNS_REPLICATION_LEVEL 5
+
/* Ignore for now not used anyway and probably never will */
#define GNUNET_MESSAGE_TYPE_GNS_CLIENT_LOOKUP 23
#define GNUNET_MESSAGE_TYPE_GNS_CLIENT_RESULT 24
/* a handle for dht lookups. should be NULL if no lookups are in progress */
struct GNUNET_DHT_GetHandle *get_handle;
+ /* timeout task for dht lookups */
+ GNUNET_SCHEDULER_TaskIdentifier dht_timeout_task;
+
};
GNUNET_SCHEDULER_TaskIdentifier zone_update_taskid = GNUNET_SCHEDULER_NO_TASK;
/* Prototypes */
-void reply_to_dns(struct GNUNET_GNS_ResolverHandle *answer, uint32_t rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd);
-void resolve_name(struct GNUNET_GNS_ResolverHandle *rh);
+static void reply_to_dns(struct GNUNET_GNS_ResolverHandle *answer,
+ uint32_t rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd);
+static void resolve_name(struct GNUNET_GNS_ResolverHandle *rh);
/**
* Task run during shutdown.
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
/* Kill zone task for it may make the scheduler hang */
- GNUNET_SCHEDULER_cancel(zone_update_taskid);
+ if (zone_update_taskid)
+ GNUNET_SCHEDULER_cancel(zone_update_taskid);
GNUNET_DNS_disconnect(dns_handle);
- GNUNET_NAMESTORE_disconnect(namestore_handle, 0);
+ GNUNET_NAMESTORE_disconnect(namestore_handle, 1);
GNUNET_DHT_disconnect(dht_handle);
}
"Error putting records into namestore: %s\n", emsg);
}
+/**
+ * Handle timeout for DHT requests
+ *
+ * @param cls the request handle as closure
+ * @param tc the task context
+ */
+static void
+dht_lookup_timeout(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_GNS_ResolverHandle *rh = cls;
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "dht lookup for query %s (type=%d) timed out.\n",
+ rh->name, rh->query->type);
+
+ GNUNET_DHT_get_stop (rh->get_handle);
+ reply_to_dns(rh, 0, NULL);
+}
+
/**
* Function called when we get a result from the dht
* for our query
* @param size the size of the record
* @param data the record data
*/
-void
+static void
process_authority_dht_result(void* cls,
struct GNUNET_TIME_Absolute exp,
const GNUNET_HashCode * key,
{
struct GNUNET_GNS_ResolverHandle *rh;
struct GNSNameRecordBlock *nrb;
- struct GNSRecordBlock *rb;
uint32_t num_records;
char* name = NULL;
+ char* rd_data = (char*) data;
int i;
+ int rd_size;
GNUNET_HashCode zone, name_hash;
if (data == NULL)
rh = (struct GNUNET_GNS_ResolverHandle *)cls;
nrb = (struct GNSNameRecordBlock*)data;
+ /* stop dht lookup and timeout task */
GNUNET_DHT_get_stop (rh->get_handle);
+ GNUNET_SCHEDULER_cancel(rh->dht_timeout_task);
+
rh->get_handle = NULL;
num_records = ntohl(nrb->rd_count);
- struct GNUNET_NAMESTORE_RecordData rd[num_records];
name = (char*)&nrb[1];
- rb = (struct GNSRecordBlock *)&name[strlen(name) + 1];
-
- for (i=0; i<num_records; i++)
{
-
- rd[i].record_type = ntohl(rb->type);
- rd[i].data_size = ntohl(rb->data_length);
- rd[i].data = &rb[1];
- rd[i].expiration = GNUNET_TIME_absolute_ntoh(rb->expiration);
- rd[i].flags = ntohl(rb->flags);
+ struct GNUNET_NAMESTORE_RecordData rd[num_records];
+ rd_data += strlen(name) + 1 + sizeof(struct GNSNameRecordBlock);
+ rd_size = size - strlen(name) - 1 - sizeof(struct GNSNameRecordBlock);
+
+ if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (rd_size,
+ rd_data,
+ num_records,
+ rd))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Error deserializing data!\n");
+ return;
+ }
+
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"Got name: %s (wanted %s)\n", name, rh->authority_name);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Got type: %d raw %d (wanted %d)\n",
- rd[i].record_type, rb->type, GNUNET_GNS_RECORD_PKEY);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Got data length: %d\n", rd[i].data_size);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Got flag %d\n", rd[i].flags);
-
- if ((strcmp(name, rh->authority_name) == 0) &&
- (rd[i].record_type == GNUNET_GNS_RECORD_PKEY))
+ for (i=0; i<num_records; i++)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Authority found in DHT\n");
- rh->answered = 1;
- GNUNET_CRYPTO_hash(
- (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *)rd[i].data,
- rd[i].data_size,
- &rh->authority);
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Got name: %s (wanted %s)\n", name, rh->authority_name);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Got type: %d (wanted %d)\n",
+ rd[i].record_type, GNUNET_GNS_RECORD_PKEY);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Got data length: %d\n", rd[i].data_size);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Got flag %d\n", rd[i].flags);
+
+ if ((strcmp(name, rh->authority_name) == 0) &&
+ (rd[i].record_type == GNUNET_GNS_RECORD_PKEY))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Authority found in DHT\n");
+ rh->answered = 1;
+ GNUNET_CRYPTO_hash(
+ (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *)rd[i].data,
+ rd[i].data_size,
+ &rh->authority);
+ }
+
}
- rb = (struct GNSRecordBlock*)((char*)&rb[1] + rd[i].data_size);
- }
- GNUNET_CRYPTO_hash(name, strlen(name), &name_hash);
- GNUNET_CRYPTO_hash_xor(key, &name_hash, &zone);
+ GNUNET_CRYPTO_hash(name, strlen(name), &name_hash);
+ GNUNET_CRYPTO_hash_xor(key, &name_hash, &zone);
- /* Save to namestore */
- if (0 == GNUNET_CRYPTO_hash_cmp(&zone_hash, &zone))
- {
- GNUNET_NAMESTORE_record_put (namestore_handle,
- &nrb->public_key,
- name,
- exp,
- num_records,
- rd,
- &nrb->signature,
- &on_namestore_record_put_result, //cont
- NULL); //cls
+ /* Save to namestore */
+ if (0 == GNUNET_CRYPTO_hash_cmp(&zone_hash, &zone))
+ {
+ GNUNET_NAMESTORE_record_put (namestore_handle,
+ &nrb->public_key,
+ name,
+ exp,
+ num_records,
+ rd,
+ &nrb->signature,
+ &on_namestore_record_put_result, //cont
+ NULL); //cls
+ }
}
if (rh->answered)
* @param rh the pending gns query
* @param name the name of the PKEY record
*/
-void
+static void
resolve_authority_dht(struct GNUNET_GNS_ResolverHandle *rh)
{
uint32_t xquery;
- struct GNUNET_TIME_Relative timeout;
GNUNET_HashCode name_hash;
GNUNET_HashCode lookup_key;
&name_hash);
GNUNET_CRYPTO_hash_xor(&name_hash, &rh->authority, &lookup_key);
- timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5);
-
+ rh->dht_timeout_task = GNUNET_SCHEDULER_add_delayed (DHT_LOOKUP_TIMEOUT,
+ &dht_lookup_timeout, rh);
+
xquery = htonl(GNUNET_GNS_RECORD_PKEY);
//FIXME how long to wait for results?
- rh->get_handle = GNUNET_DHT_get_start(dht_handle, timeout,
+ rh->get_handle = GNUNET_DHT_get_start(dht_handle,
+ DHT_OPERATION_TIMEOUT,
GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
&lookup_key,
- 5, //Replication level FIXME
+ DHT_GNS_REPLICATION_LEVEL,
GNUNET_DHT_RO_NONE,
&xquery,
sizeof(xquery),
* @param size the size of the record
* @param data the record data
*/
-void
+static void
process_name_dht_result(void* cls,
struct GNUNET_TIME_Absolute exp,
const GNUNET_HashCode * key,
{
struct GNUNET_GNS_ResolverHandle *rh;
struct GNSNameRecordBlock *nrb;
- struct GNSRecordBlock *rb;
uint32_t num_records;
char* name = NULL;
+ char* rd_data = (char*)data;
int i;
+ int rd_size;
+
GNUNET_HashCode zone, name_hash;
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "got dht result (size=%d)\n", size);
rh = (struct GNUNET_GNS_ResolverHandle *)cls;
nrb = (struct GNSNameRecordBlock*)data;
-
+
+ /* stop lookup and timeout task */
GNUNET_DHT_get_stop (rh->get_handle);
+ GNUNET_SCHEDULER_cancel(rh->dht_timeout_task);
+
rh->get_handle = NULL;
+ name = (char*)&nrb[1];
num_records = ntohl(nrb->rd_count);
- struct GNUNET_NAMESTORE_RecordData rd[num_records];
+ {
+ struct GNUNET_NAMESTORE_RecordData rd[num_records];
- name = (char*)&nrb[1];
- rb = (struct GNSRecordBlock*)&name[strlen(name) + 1];
+ rd_data += strlen(name) + 1 + sizeof(struct GNSNameRecordBlock);
+ rd_size = size - strlen(name) - 1 - sizeof(struct GNSNameRecordBlock);
- for (i=0; i<num_records; i++)
- {
- rd[i].record_type = ntohl(rb->type);
- rd[i].data_size = ntohl(rb->data_length);
- rd[i].data = (char*)&rb[1];
- rd[i].expiration = GNUNET_TIME_absolute_ntoh(rb->expiration);
- rd[i].flags = ntohl(rb->flags);
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (rd_size,
+ rd_data,
+ num_records,
+ rd))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Error deserializing data!\n");
+ return;
+ }
+
+ for (i=0; i<num_records; i++)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"Got name: %s (wanted %s)\n", name, rh->name);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Got type: %d raw %d (wanted %d)\n",
- rd[i].record_type, rb->type, rh->query->type);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Got type: %d (wanted %d)\n",
+ rd[i].record_type, rh->query->type);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"Got data length: %d\n", rd[i].data_size);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"Got flag %d\n", rd[i].flags);
- /* FIXME class? */
- if ((strcmp(name, rh->name) == 0) &&
- (rd[i].record_type == rh->query->type))
- {
- rh->answered++;
- }
-
- rb = (struct GNSRecordBlock*)((char*)&rb[1] + rd[i].data_size);
+ if ((strcmp(name, rh->name) == 0) &&
+ (rd[i].record_type == rh->query->type))
+ {
+ rh->answered++;
+ }
- }
+ }
- GNUNET_CRYPTO_hash(name, strlen(name), &name_hash);
- GNUNET_CRYPTO_hash_xor(key, &name_hash, &zone);
+ GNUNET_CRYPTO_hash(name, strlen(name), &name_hash);
+ GNUNET_CRYPTO_hash_xor(key, &name_hash, &zone);
- /**
- * FIXME check pubkey against existing key in namestore?
- * https://gnunet.org/bugs/view.php?id=2179
- */
+ /**
+ * FIXME check pubkey against existing key in namestore?
+ * https://gnunet.org/bugs/view.php?id=2179
+ */
- /* Save to namestore */
- GNUNET_NAMESTORE_record_put (namestore_handle,
- &nrb->public_key,
- name,
- exp,
- num_records,
- rd,
- &nrb->signature,
- &on_namestore_record_put_result, //cont
- NULL); //cls
+ /* Save to namestore */
+ GNUNET_NAMESTORE_record_put (namestore_handle,
+ &nrb->public_key,
+ name,
+ exp,
+ num_records,
+ rd,
+ &nrb->signature,
+ &on_namestore_record_put_result, //cont
+ NULL); //cls
- if (rh->answered)
- reply_to_dns(rh, num_records, rd);
- else
- reply_to_dns(rh, 0, NULL);
+ if (rh->answered)
+ reply_to_dns(rh, num_records, rd);
+ else
+ reply_to_dns(rh, 0, NULL);
+ }
}
+
+
+
/**
* Start DHT lookup for a (name -> query->record_type) record in
* query->authority's zone
* @param rh the pending gns query context
* @param name the name to query record
*/
-void
+static void
resolve_name_dht(struct GNUNET_GNS_ResolverHandle *rh, const char* name)
{
uint32_t xquery;
- struct GNUNET_TIME_Relative timeout;
GNUNET_HashCode name_hash;
GNUNET_HashCode lookup_key;
struct GNUNET_CRYPTO_HashAsciiEncoded lookup_key_string;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "A\n");
+
GNUNET_CRYPTO_hash(name, strlen(name), &name_hash);
GNUNET_CRYPTO_hash_xor(&name_hash, &rh->authority, &lookup_key);
GNUNET_CRYPTO_hash_to_enc (&lookup_key, &lookup_key_string);
"starting dht lookup for %s with key: %s\n",
name, (char*)&lookup_key_string);
- timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5);
-
+ rh->dht_timeout_task = GNUNET_SCHEDULER_add_delayed(DHT_LOOKUP_TIMEOUT,
+ &dht_lookup_timeout, rh);
+
xquery = htonl(rh->query->type);
//FIXME how long to wait for results?
- rh->get_handle = GNUNET_DHT_get_start(dht_handle, timeout,
+ rh->get_handle = GNUNET_DHT_get_start(dht_handle,
+ DHT_OPERATION_TIMEOUT,
GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
&lookup_key,
- 5, //Replication level FIXME
+ DHT_GNS_REPLICATION_LEVEL,
GNUNET_DHT_RO_NONE,
- &xquery, //xquery FIXME is this bad?
+ &xquery,
sizeof(xquery),
&process_name_dht_result,
rh);
}
//Prototype
-void
+static void
resolve_name(struct GNUNET_GNS_ResolverHandle *rh);
/**
* @param rd the record data
* @param signature the signature of the authority for the record data
*/
-void
+static void
process_authority_lookup(void* cls,
const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *key,
struct GNUNET_TIME_Absolute expiration,
struct GNUNET_GNS_ResolverHandle *rh;
struct GNUNET_TIME_Relative remaining_time;
GNUNET_HashCode zone;
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Got %d records from authority lookup\n",
+ rd_count);
rh = (struct GNUNET_GNS_ResolverHandle *)cls;
GNUNET_CRYPTO_hash(key,
* _IF_ the current authoritative zone is us we cannot resolve
* _ELSE_ we can still check the _expired_ dht
*/
- if (0 != GNUNET_CRYPTO_hash_cmp(&zone, &zone_hash) &&
+ if ((0 != GNUNET_CRYPTO_hash_cmp(&rh->authority, &zone_hash)) &&
(remaining_time.rel_value == 0))
{
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Authority %s unknown in namestore, trying dht\n",
+ rh->authority_name);
resolve_authority_dht(rh);
return;
}
if (rd[i].record_type != GNUNET_GNS_RECORD_PKEY)
continue;
- if ((GNUNET_TIME_absolute_get_remaining (rd[i].expiration)).rel_value
- == 0)
+ if ((GNUNET_TIME_absolute_get_remaining (rd[i].expiration)).rel_value
+ == 0)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "This pkey is expired.\n");
+ if (remaining_time.rel_value == 0)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "This pkey is expired.\n");
- if (remaining_time.rel_value == 0)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "This dht entry is expired. Refreshing\n");
- resolve_authority_dht(rh);
- }
-
- continue;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "This dht entry is expired. Refreshing\n");
+ resolve_authority_dht(rh);
}
- /**
- * Resolve rest of query with new authority
- */
- GNUNET_assert(rd[i].record_type == GNUNET_GNS_RECORD_PKEY);
- GNUNET_CRYPTO_hash(rd[i].data,
- sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &rh->authority);
- resolve_name(rh);
- return;
-
+ continue;
+ }
+
+ /**
+ * Resolve rest of query with new authority
+ */
+ GNUNET_assert(rd[i].record_type == GNUNET_GNS_RECORD_PKEY);
+ GNUNET_CRYPTO_hash(rd[i].data,
+ sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ &rh->authority);
+ resolve_name(rh);
+ return;
}
/**
* @param rd_count the number of records to return
* @param rd the record data
*/
-void
+static void
reply_to_dns(struct GNUNET_GNS_ResolverHandle *rh, uint32_t rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd)
{
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"trying dht...\n");
- resolve_name_dht(rh, name);
+ resolve_name_dht(rh, rh->name);
return;
}
else
* @param name the name to test
* @return 1 if canonical
*/
-int
+static int
is_canonical(char* name)
{
uint32_t len = strlen(name);
* @param name the domain
* @return the tld
*/
-char* pop_tld(char* name)
+static char*
+pop_tld(char* name)
{
uint32_t len;
*
* @param rh the pending lookup
*/
-void
+static void
resolve_name(struct GNUNET_GNS_ResolverHandle *rh)
{
if (is_canonical(rh->name))
* @param p the DNS query packet we received
* @param q the DNS query we received parsed from p
*/
-void
+static void
start_resolution(struct GNUNET_DNS_RequestHandle *request,
struct GNUNET_DNSPARSER_Packet *p,
struct GNUNET_DNSPARSER_Query *q)
{
struct GNUNET_GNS_ResolverHandle *rh;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting resolution for (%s)!\n",
- q->name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting resolution for %s (type=%d)!\n",
+ q->name, q->type);
rh = GNUNET_malloc(sizeof (struct GNUNET_GNS_ResolverHandle));
rh->packet = p;
* @param request_length number of bytes in request
* @param request udp payload of the DNS request
*/
-void
+static void
handle_dns_request(void *cls,
struct GNUNET_DNS_RequestHandle *rh,
size_t request_length,
}
-/**
- * test function that stores some data in the namestore
- * This will also be replaced by a test progrm that
- * directl interfaces with the namestore
- */
-void
-put_some_records(void)
-{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Populating namestore\n");
- /* put an A record into namestore FIXME use gnunet.org */
- char* ipB = "5.6.7.8";
-
- struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr));
- struct GNUNET_NAMESTORE_RecordData rdb_web;
-
- GNUNET_assert(1 == inet_pton (AF_INET, ipB, web));
-
- rdb_web.data_size = sizeof(struct in_addr);
- rdb_web.data = web;
- rdb_web.record_type = GNUNET_DNSPARSER_TYPE_A;
- rdb_web.expiration = GNUNET_TIME_absolute_get_forever ();
-
- GNUNET_NAMESTORE_record_create (namestore_handle,
- zone_key,
- "www",
- &rdb_web,
- NULL,
- NULL);
-}
-
/**
* Method called periodicattluy that triggers
* iteration over root zone
* @param cls closure
* @param tc task context
*/
-void
+static void
update_zone_dht_next(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_NAMESTORE_zone_iterator_next(namestore_iter);
* @param cls closure
* @param tc task context
*/
-void
+static void
record_dht_put(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "put request transmitted\n");
/**
* Function used to put all records successively into the DHT.
- * FIXME bug here
*
* @param cls the closure (NULL)
* @param key the public key of the authority (ours)
* @param rd the record data
* @param signature the signature for the record data
*/
-void
+static void
put_gns_record(void *cls,
const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *key,
struct GNUNET_TIME_Absolute expiration,
const struct GNUNET_NAMESTORE_RecordData *rd,
const struct GNUNET_CRYPTO_RsaSignature *signature)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Putting records for %s into the DHT\n", name);
- struct GNUNET_TIME_Relative timeout;
+
struct GNSNameRecordBlock *nrb;
- struct GNSRecordBlock *rb;
GNUNET_HashCode name_hash;
GNUNET_HashCode xor_hash;
struct GNUNET_CRYPTO_HashAsciiEncoded xor_hash_string;
- int i;
uint32_t rd_payload_length;
+ char* nrb_data = NULL;
/* we're done */
if (NULL == name)
return;
}
- rd_payload_length = rd_count * sizeof(struct GNSRecordBlock);
- rd_payload_length += strlen(name) + 1 + sizeof(struct GNSNameRecordBlock);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Putting records for %s into the DHT\n", name);
- /* calculate payload size */
- for (i=0; i<rd_count; i++)
- {
- rd_payload_length += rd[i].data_size;
- }
+ rd_payload_length = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
- nrb = GNUNET_malloc(rd_payload_length);
+ nrb = GNUNET_malloc(rd_payload_length + strlen(name) + 1
+ + sizeof(struct GNSNameRecordBlock));
if (signature != NULL)
- memcpy(&nrb->signature, signature,
- sizeof(struct GNUNET_CRYPTO_RsaSignature));
- //FIXME signature purpose
- memcpy(&nrb->public_key, key,
- sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
+ nrb->signature = *signature;
+
+ nrb->public_key = *key;
nrb->rd_count = htonl(rd_count);
+
+ memset(&nrb[1], 0, strlen(name) + 1);
+ memcpy(&nrb[1], name, strlen(name));
- memcpy(&nrb[1], name, strlen(name) + 1); //FIXME is this 0 terminated??
+ nrb_data = (char*)&nrb[1];
+ nrb_data += strlen(name) + 1;
- rb = (struct GNSRecordBlock *)((char*)&nrb[1] + strlen(name) + 1);
+ rd_payload_length += sizeof(struct GNSNameRecordBlock) +
+ strlen(name) + 1;
- for (i=0; i<rd_count; i++)
+ if (-1 == GNUNET_NAMESTORE_records_serialize (rd_count,
+ rd,
+ rd_payload_length,
+ nrb_data))
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Read record with type %d\n",
- rd[i].record_type);
- rb->type = htonl(rd[i].record_type);
- rb->expiration = GNUNET_TIME_absolute_hton(rd[i].expiration);
- rb->data_length = htonl(rd[i].data_size);
- rb->flags = htonl(rd[i].flags);
- memcpy(&rb[1], rd[i].data, rd[i].data_size);
- rb = &rb[1] + rd[i].data_size;
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n");
+ return;
+ //FIXME what to do
}
- /**
- * FIXME magic number 20 move to config file
- * DHT_WAIT_TIMEOUT
- */
- timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20);
-
+
/*
* calculate DHT key: H(name) xor H(pubkey)
*/
name, (char*)&xor_hash_string, rd_payload_length);
GNUNET_DHT_put (dht_handle, &xor_hash,
- 5, //replication level
+ DHT_GNS_REPLICATION_LEVEL,
GNUNET_DHT_RO_NONE,
- GNUNET_BLOCK_TYPE_GNS_NAMERECORD, //FIXME todo block plugin
+ GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
rd_payload_length,
(char*)nrb,
expiration,
- timeout,
- &record_dht_put, //FIXME continuation needed? success check? yes ofc
+ DHT_OPERATION_TIMEOUT,
+ &record_dht_put,
NULL); //cls for cont
num_public_records++;
}
-/**
- * Puts a single trusted entity into the
- * namestore. Will be replaced in a testcase
- * that directly interacts with a persistent
- * namestore.
- *
- * @param name name of entity
- * @param keyfile keyfile
- */
-void
-put_trusted(char* name, char* keyfile)
-{
- struct GNUNET_NAMESTORE_RecordData rd;
- struct GNUNET_CRYPTO_RsaPrivateKey *key;
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pkey;
- pkey = GNUNET_malloc(sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
-
- key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
- GNUNET_CRYPTO_rsa_key_get_public (key, pkey);
- rd.data = pkey;
- rd.expiration = GNUNET_TIME_absolute_get_forever ();
- rd.data_size = sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded);
- rd.record_type = GNUNET_GNS_RECORD_PKEY;
-
- GNUNET_NAMESTORE_record_create (namestore_handle,
- zone_key,
- name,
- &rd,
- NULL,
- NULL);
-}
-
-
-
/**
* Periodically iterate over our zone and store everything in dht
*
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Initializing GNS\n");
char* keyfile;
- char* trusted_entities;
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (c, "gns",
return;
}
- char* trusted_start;
- char* trusted_name;
- char *trusted_key;
- int trusted_len;
- if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (c, "gns",
- "TRUSTED",
- &trusted_entities))
- {
- trusted_start = trusted_entities;
- trusted_len = strlen(trusted_entities);
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Found trusted entities in config file, importing\n");
- while ((trusted_entities-trusted_start) < trusted_len)
- {
- trusted_name = trusted_entities;
- while (*trusted_entities != ':')
- trusted_entities++;
- *trusted_entities = '\0';
- trusted_entities++;
- trusted_key = trusted_entities;
- while (*trusted_entities != ',' && (*trusted_entities != '\0'))
- trusted_entities++;
- *trusted_entities = '\0';
- trusted_entities++;
-
- if (GNUNET_YES == GNUNET_DISK_file_test (trusted_key))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Adding %s:%s to root zone\n",
- trusted_name,
- trusted_key);
- put_trusted(trusted_name, trusted_key);
- }
- else
- {
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Keyfile %s does not exist!\n",
- trusted_key);
- //put_trusted(trusted_name, trusted_key); //FIXME for testing
- }
- }
-
- }
-
/**
* handle to the dht
*/
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Could not connect to DHT!\n");
}
- put_some_records(); //FIXME for testing
+ //put_some_records(); //FIXME for testing
/**
* Schedule periodic put
*/
dht_update_interval = GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS,
1);
- zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_start, NULL);
+ //zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_start, NULL);
}
projects / oweals / gnunet.git / blobdiff