#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 result list for namestore queries
+ * Handle to a currenty pending resolution
*/
struct GNUNET_GNS_ResolverHandle
{
/* the authoritative zone to query */
GNUNET_HashCode authority;
+ /* the name of the authoritative zone to query */
+ char *authority_name;
+
/**
* we have an authority in namestore that
* may be able to resolve
/* 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;
+
};
struct GNUNET_TIME_Relative dht_update_interval;
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);
+/* Prototypes */
+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.
static void
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);
+ /* Kill zone task for it may make the scheduler hang */
+ 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;
- //FIXME GNS block check
-
if (data == NULL)
return;
//FIXME check expiration?
+
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 *)(&nrb[1] + strlen(name));
-
- 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 = ntohs(rb->flags);
+ struct GNUNET_NAMESTORE_RecordData rd[num_records];
- if (strcmp(name, rh->query->name) &&
- (rd[i].record_type == rh->query->type))
+ 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);
+ for (i=0; i<num_records; i++)
{
- rh->answered = 1;
+
+ 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);
+ }
+
}
- }
- GNUNET_CRYPTO_hash(name, strlen(name), &name_hash);
- GNUNET_CRYPTO_hash_xor(key, &name_hash, &zone);
-
- //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
+ 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
+ }
+ }
if (rh->answered)
{
rh->answered = 0;
- rh->authority = zone;
resolve_name(rh);
return;
}
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "No authority in records\n");
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "No authority in records\n");
reply_to_dns(rh, 0, NULL);
}
* @param rh the pending gns query
* @param name the name of the PKEY record
*/
-void
-resolve_authority_dht(struct GNUNET_GNS_ResolverHandle *rh, const char* name)
+static void
+resolve_authority_dht(struct GNUNET_GNS_ResolverHandle *rh)
{
- enum GNUNET_GNS_RecordType rtype = GNUNET_GNS_RECORD_PKEY;
- struct GNUNET_TIME_Relative timeout;
+ uint32_t xquery;
GNUNET_HashCode name_hash;
GNUNET_HashCode lookup_key;
- GNUNET_CRYPTO_hash(name, strlen(name), &name_hash);
+ GNUNET_CRYPTO_hash(rh->authority_name,
+ strlen(rh->authority_name),
+ &name_hash);
GNUNET_CRYPTO_hash_xor(&name_hash, &rh->authority, &lookup_key);
- timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20);
-
+ 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,
- GNUNET_BLOCK_TYPE_TEST, //FIXME todo
+ 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,
- &rtype, //xquery FIXME this is bad
- sizeof(GNUNET_GNS_RECORD_PKEY),
+ &xquery,
+ sizeof(xquery),
&process_authority_dht_result,
rh);
* @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);
+
if (data == NULL)
return;
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*)(&nrb[1] + strlen(name));
+ 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 = ntohs(rb->flags);
- //FIXME class?
- if (strcmp(name, rh->query->name) &&
- (rd[i].record_type == rh->query->type))
+ if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (rd_size,
+ rd_data,
+ num_records,
+ rd))
{
- rh->answered++;
+ 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 (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,
+ "Got flag %d\n", rd[i].flags);
+
+ 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
-
- //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
+ /**
+ * 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
- 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)
{
- struct GNUNET_TIME_Relative timeout;
+ uint32_t xquery;
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);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "starting dht lookup for %s with key: %s\n",
+ name, (char*)&lookup_key_string);
- timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20);
-
+ 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,
- GNUNET_BLOCK_TYPE_TEST, //FIXME todo
+ 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,
- &rh->query->type, //xquery
- sizeof(rh->query->type),
+ &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, GNUNET_CRYPTO_RSA_KEY_LENGTH, &zone);
+ GNUNET_CRYPTO_hash(key,
+ sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ &zone);
remaining_time = GNUNET_TIME_absolute_get_remaining (expiration);
/**
* _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))
{
- resolve_authority_dht(rh, name);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Authority %s unknown in namestore, trying dht\n",
+ rh->authority_name);
+ resolve_authority_dht(rh);
return;
}
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Authority unknown\n");
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Authority %s unknown\n",
+ rh->authority_name);
reply_to_dns(rh, 0, NULL);
return;
}
for (i=0; i<rd_count;i++)
{
- if (strcmp(name, rh->query->name) && rd[i].record_type
- != GNUNET_GNS_RECORD_PKEY)
+ 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, name);
- }
-
- continue;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "This dht entry is expired. Refreshing\n");
+ resolve_authority_dht(rh);
}
- GNUNET_assert(rd[i].record_type == GNUNET_GNS_RECORD_PKEY);
- GNUNET_CRYPTO_hash(rd[i].data, GNUNET_CRYPTO_RSA_KEY_LENGTH,
- &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;
}
/**
* no answers found
*/
-
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Authority lookup successful but no PKEY... never get here?\n");
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Authority lookup successful but no PKEY... never get here\n");
reply_to_dns(rh, 0, NULL);
}
* @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)
{
packet->answers = answer_records;
packet->additional_records = additional_records;
+ /**
+ * Put records in the DNS packet and modify it
+ * to a response
+ */
len = sizeof(struct GNUNET_DNSPARSER_Record*);
for (i=0; i < rd_count; i++)
{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"Adding type %d to DNS response\n", rd[i].record_type);
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Name: %s\n", rh->name);
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "QName: %s\n", rh->query->name);
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Record %d/%d\n", i+1, rd_count);
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Record len %d\n", rd[i].data_size);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Name: %s\n", rh->name);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "QName: %s\n", rh->query->name);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Record %d/%d\n", i+1, rd_count);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Record len %d\n", rd[i].data_size);
+
if (rd[i].record_type == rh->query->type)
{
answer_records[i].name = rh->query->name;
additional_records[i].expiration_time = rd[i].expiration;
additional_records[i].class = GNUNET_DNSPARSER_CLASS_INTERNET;//hmmn
}
- //GNUNET_free(i->record); DO this later!
}
- packet->num_answers = rh->answered; //answer->num_records;
+ packet->num_answers = rh->answered;
packet->num_additional_records = rd_count-(rh->answered);
if (0 == GNUNET_CRYPTO_hash_cmp(&rh->authority, &zone_hash))
packet->flags.authoritative_answer = 1;
else
- packet->flags.authoritative_answer = 0;
+ packet->flags.authoritative_answer = 0;
if (rd == NULL)
packet->flags.return_code = GNUNET_DNSPARSER_RETURN_CODE_NAME_ERROR;
packet->flags.query_or_response = 1;
- //FIXME this is silently discarded
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+
+ /**
+ * Reply to DNS
+ */
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"Building DNS response\n");
ret = GNUNET_DNSPARSER_pack (packet,
1024, /* FIXME magic from dns redirector */
&buf,
&len);
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"Built DNS response! (ret=%d,len=%d)\n", ret, len);
if (ret == GNUNET_OK)
{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"Answering DNS request\n");
GNUNET_DNS_request_answer(rh->request_handle,
len,
buf);
//GNUNET_free(answer);
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Answered DNS request\n");
- //FIXME return code, free datastructures
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Answered DNS request\n");
}
else
{
"Error building DNS response! (ret=%d)", ret);
}
- //FIXME into free_resolver(rh)
GNUNET_free(rh->name);
GNUNET_free(rh);
}
/**
- * Namestore calls this function if we have an entry for this name.
- * (or data=null to indicate the lookup has finished
+ * Namestore calls this function if we have record for this name.
+ * (or with rd_count=0 to indicate no matches)
*
* @param cls the pending query
* @param key the key of the zone we did the lookup
GNUNET_HashCode zone;
rh = (struct GNUNET_GNS_ResolverHandle *) cls;
- GNUNET_CRYPTO_hash(key, GNUNET_CRYPTO_RSA_KEY_LENGTH, &zone);
+ GNUNET_CRYPTO_hash(key,
+ sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ &zone);
remaining_time = GNUNET_TIME_absolute_get_remaining (expiration);
- //FIXME Handle results in rd
-
if (rd_count == 0)
{
/**
* Lookup terminated and no results
* -> DHT Phase unless data is recent
*/
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"Namestore lookup for %s terminated without results\n", name);
/**
* if this is not our zone we cannot rely on the namestore to be
* complete. -> Query DHT
*/
- if (!GNUNET_CRYPTO_hash_cmp(&zone, &zone_hash))
+ if (GNUNET_CRYPTO_hash_cmp(&zone, &zone_hash))
{
if (remaining_time.rel_value == 0)
{
- resolve_name_dht(rh, name);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "trying dht...\n");
+ resolve_name_dht(rh, rh->name);
return;
}
else
* Our zone and no result? Cannot resolve TT
*/
GNUNET_assert(rh->answered == 0);
- reply_to_dns(rh, 0, NULL); //answered should be 0
+ reply_to_dns(rh, 0, NULL);
return;
}
else
{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"Processing additional result %s from namestore\n", name);
int i;
for (i=0; i<rd_count;i++)
{
- if (strcmp(name, rh->query->name) && rd[i].record_type != rh->query->type)
+ if ((strcmp(name, rh->query->name) == 0)
+ && (rd[i].record_type != rh->query->type))
continue;
if ((GNUNET_TIME_absolute_get_remaining (rd[i].expiration)).rel_value
== 0)
{
- //FIXME there is a catch here...
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "This record is expired. Skipping\n");
continue;
}
return;
}
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Found %d answer(s) to query!\n",
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Found %d answer(s) to query!\n",
rh->answered);
reply_to_dns(rh, rd_count, rd);
* @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;
}
if (len == 0)
- return NULL; //Error
+ return NULL;
- name[len] = '\0'; //terminate string
+ name[len] = '\0';
return (name+len+1);
}
* The first phase of resolution.
* First check if the name is canonical.
* If it is then try to resolve directly.
- * If not then first have to resolve the authoritative entities.
+ * If not then we first have to resolve the authoritative entities.
*
* @param rh the pending lookup
- * @param zone the zone we are currently resolving in
*/
-void
+static void
resolve_name(struct GNUNET_GNS_ResolverHandle *rh)
{
if (is_canonical(rh->name))
{
- //We only need to check this zone's ns
+ /* We only need to check the current zone's ns */
GNUNET_NAMESTORE_lookup_record(namestore_handle,
&rh->authority,
rh->name,
}
else
{
- //We have to resolve the authoritative entity
- char *new_authority = pop_tld(rh->name);
+ /* We have to resolve the authoritative entity first */
+ rh->authority_name = pop_tld(rh->name);
GNUNET_NAMESTORE_lookup_record(namestore_handle,
&rh->authority,
- new_authority,
+ rh->authority_name,
GNUNET_GNS_RECORD_PKEY,
&process_authority_lookup,
rh);
/**
* Entry point for name resolution
- * Lookup local namestore of our zone.
- *
* Setup a new query and try to resolve
*
* @param request the request handle of the DNS request from a client
* @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_INFO, "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;
rh->query = q;
rh->authority = zone_hash;
- //FIXME do not forget to free!!
rh->name = GNUNET_malloc(strlen(q->name)
- strlen(gnunet_tld) + 1);
memset(rh->name, 0,
rh->request_handle = request;
- //Start resolution in our zone
+ /* Start resolution in our zone */
resolve_name(rh);
}
* @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,
struct GNUNET_DNSPARSER_Packet *p;
char *tldoffset;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Hijacked a DNS request...processing\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Hijacked a DNS request...processing\n");
p = GNUNET_DNSPARSER_parse (request, request_length);
if (NULL == p)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Received malformed DNS packet, leaving it untouched\n");
GNUNET_DNS_request_forward (rh);
return;
if (p->num_queries > 1)
{
- //Note: We could also look for .gnunet
+ /* Note: We could also look for .gnunet */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
">1 queriy in DNS packet... odd. We only process #1\n");
}
-
+
+ /**
+ * Check for .gnunet
+ */
tldoffset = p->queries[0].name + strlen(p->queries[0].name);
while ((*tldoffset) != '.')
/**
* This request does not concern us. Forward to real DNS.
*/
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"Request for %s is forwarded to DNS\n", p->queries[0].name);
GNUNET_DNS_request_forward (rh);
}
}
/**
- * test function that stores some data in the namestore
+ * Method called periodicattluy that triggers
+ * iteration over root zone
+ *
+ * @param cls closure
+ * @param tc task context
*/
-void
-put_some_records(void)
+static void
+update_zone_dht_next(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Populating namestore\n");
- /* put a few records into namestore */
- char* ipA = "1.2.3.4";
- char* ipB = "5.6.7.8";
- struct GNUNET_CRYPTO_RsaPrivateKey *bob_key = GNUNET_CRYPTO_rsa_key_create (); struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *bob;
- bob = GNUNET_malloc(sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
-
- GNUNET_CRYPTO_rsa_key_get_public (bob_key, bob);
-
- GNUNET_HashCode *bob_zone = GNUNET_malloc(sizeof(GNUNET_HashCode));
-
- GNUNET_CRYPTO_hash(bob, GNUNET_CRYPTO_RSA_KEY_LENGTH, bob_zone);
-
- struct in_addr *alice = GNUNET_malloc(sizeof(struct in_addr));
- struct in_addr *bob_web = GNUNET_malloc(sizeof(struct in_addr));
- struct GNUNET_NAMESTORE_RecordData rda;
- struct GNUNET_NAMESTORE_RecordData rdb;
- struct GNUNET_NAMESTORE_RecordData rdb_web;
-
- GNUNET_assert(1 == inet_pton (AF_INET, ipA, alice));
- GNUNET_assert(1 == inet_pton (AF_INET, ipB, bob_web));
-
- rda.data_size = sizeof(struct in_addr);
- rdb_web.data_size = sizeof(struct in_addr);
- rdb.data_size = sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded);
- rda.data = alice;
- rdb.data = bob;
- rdb_web.data = bob_web;
- rda.record_type = GNUNET_GNS_RECORD_TYPE_A;
- rdb_web.record_type = GNUNET_GNS_RECORD_TYPE_A;
- rdb.record_type = GNUNET_GNS_RECORD_PKEY;
- rdb_web.expiration = GNUNET_TIME_absolute_get_forever ();
- rda.expiration = GNUNET_TIME_absolute_get_forever ();
- rdb.expiration = GNUNET_TIME_absolute_get_forever ();
-
- //alice.gnunet A IN 1.2.3.4
- GNUNET_NAMESTORE_record_create (namestore_handle,
- zone_key,
- "alice",
- &rda,
- NULL,
- NULL);
-
- //www.bob.gnunet A IN 5.6.7.8
- GNUNET_NAMESTORE_record_create (namestore_handle,
- zone_key,
- "bob",
- &rdb,
- NULL,
- NULL);
- GNUNET_NAMESTORE_record_put(namestore_handle,
- bob,
- "www",
- GNUNET_TIME_absolute_get_forever (),
- 1,
- &rdb_web,
- NULL, //Signature
- NULL, //Cont
- NULL); //cls
+ GNUNET_NAMESTORE_zone_iterator_next(namestore_iter);
}
-void
-update_zone_dht_next(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+/**
+ * Continuation for DHT put
+ *
+ * @param cls closure
+ * @param tc task context
+ */
+static void
+record_dht_put(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_NAMESTORE_zone_iterator_next(namestore_iter);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "put request transmitted\n");
}
/* prototype */
/**
* 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_INFO, "Putting records into the DHT\n");
- struct GNUNET_TIME_Relative timeout;
+
struct GNSNameRecordBlock *nrb;
- struct GNSRecordBlock *rb;
GNUNET_HashCode name_hash;
GNUNET_HashCode xor_hash;
- int i;
+ struct GNUNET_CRYPTO_HashAsciiEncoded xor_hash_string;
uint32_t rd_payload_length;
+ char* nrb_data = NULL;
- if (NULL == name) //We're done
+ /* we're done */
+ if (NULL == name)
{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Zone iteration finished\n");
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Zone iteration finished\n");
GNUNET_NAMESTORE_zone_iteration_stop (namestore_iter);
zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_start,
NULL);
return;
}
- rd_payload_length = rd_count * sizeof(struct GNSRecordBlock);
- rd_payload_length += strlen(name) + sizeof(struct GNSNameRecordBlock);
- //Calculate payload size
- for (i=0; i<rd_count; i++)
- {
- rd_payload_length += rd[i].data_size;
- }
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Putting records for %s into the DHT\n", name);
+
+ 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)); //FIXME is this 0 terminated??
+ nrb_data = (char*)&nrb[1];
+ nrb_data += strlen(name) + 1;
- rb = (struct GNSRecordBlock *)(&nrb[1]+strlen(name));
+ 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))
{
- 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
+
+ /*
+ * calculate DHT key: H(name) xor H(pubkey)
*/
- timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20);
GNUNET_CRYPTO_hash(name, strlen(name), &name_hash);
GNUNET_CRYPTO_hash_xor(&zone_hash, &name_hash, &xor_hash);
+ GNUNET_CRYPTO_hash_to_enc (&xor_hash, &xor_hash_string);
+ 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);
+
GNUNET_DHT_put (dht_handle, &xor_hash,
- 5, //replication level
+ DHT_GNS_REPLICATION_LEVEL,
GNUNET_DHT_RO_NONE,
- GNUNET_BLOCK_TYPE_TEST, //FIXME todo block plugin
+ GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
rd_payload_length,
(char*)nrb,
expiration,
- timeout,
- NULL, //FIXME continuation needed? success check? yes ofc
+ DHT_OPERATION_TIMEOUT,
+ &record_dht_put,
NULL); //cls for cont
num_public_records++;
static void
update_zone_dht_start(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Update zone!\n");
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Starting DHT zone update!\n");
if (0 == num_public_records)
{
dht_update_interval = GNUNET_TIME_relative_multiply(
const struct GNUNET_CONFIGURATION_Handle *c)
{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Init GNS\n");
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Initializing GNS\n");
+
char* keyfile;
- //this always returns syserr
- if (GNUNET_SYSERR ==
- GNUNET_CONFIGURATION_get_value_string (c, "gns",
- "ZONEKEY", &keyfile));
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
+
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (c, "gns",
+ "ZONEKEY", &keyfile))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"No private key for root zone specified%s!\n", keyfile);
+ GNUNET_SCHEDULER_shutdown(0);
+ return;
}
+
zone_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
- //zone_key = GNUNET_CRYPTO_rsa_key_create ();
+ GNUNET_CRYPTO_rsa_key_get_public (zone_key, &pkey);
- GNUNET_CRYPTO_hash(zone_key, GNUNET_CRYPTO_RSA_KEY_LENGTH,//FIXME is this ok?
+ GNUNET_CRYPTO_hash(&pkey, sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
&zone_hash);
+
nc = GNUNET_SERVER_notification_context_create (server, 1);
- /* FIXME - do some config parsing
- * - Maybe only hijack dns if option is set (HIJACK_DNS=1)
- */
-
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
NULL);
- /**
- * Do gnunet dns init here
- */
- dns_handle = GNUNET_DNS_connect(c,
- GNUNET_DNS_FLAG_PRE_RESOLUTION,
- &handle_dns_request, /* rh */
- NULL); /* Closure */
- if (NULL == dns_handle)
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (c, "gns",
+ "HIJACK_DNS"))
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "DNS hijacking enabled... connecting to service.\n");
+ /**
+ * Do gnunet dns init here
+ */
+ dns_handle = GNUNET_DNS_connect(c,
+ GNUNET_DNS_FLAG_PRE_RESOLUTION,
+ &handle_dns_request, /* rh */
+ NULL); /* Closure */
+ if (NULL == dns_handle)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
"Failed to connect to the dnsservice!\n");
+ }
}
+
+
/**
* handle to our local namestore
*/
//FIXME do error handling;
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
"Failed to connect to the namestore!\n");
+ GNUNET_SCHEDULER_shutdown(0);
+ return;
}
-
+
/**
* 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
* We have roughly an hour for all records;
*/
dht_update_interval = GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS,
- 1); //FIXME from cfg
- zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_start, NULL);
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "GNS Init done!\n");
+ 1);
+ //zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_start, NULL);
}
projects / oweals / gnunet.git / blobdiff