*
* TODO:
* - Write xquery and block plugin
- * - Think about mixed dns queries (.gnunet and .org)
- * - (de-)serialisation of records/signature trees
* - The smaller FIXME issues all around
*
* @file gns/gnunet-service-gns.c
#include "gnunet_dht_service.h"
#include "gnunet_namestore_service.h"
#include "gnunet_gns_service.h"
+#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
-struct GNUNET_GNS_QueryRecordList
-{
- /**
- * DLL
- */
- struct GNUNET_GNS_QueryRecordList * next;
- struct GNUNET_GNS_QueryRecordList * prev;
-
- struct GNUNET_DNSPARSER_Record * record;
-};
-
/**
- * A result list for namestore queries
+ * Handle to a currenty pending resolution
*/
-struct GNUNET_GNS_PendingQuery
+struct GNUNET_GNS_ResolverHandle
{
- /* the answer packet */
- struct GNUNET_DNSPARSER_Packet *answer;
-
- /* records to put into answer packet */
- struct GNUNET_GNS_QueryRecordList * records_head;
- struct GNUNET_GNS_QueryRecordList * records_tail;
-
- int num_records;
- int num_authority_records; //FIXME are all of our replies auth?
-
- char *original_name;
+ /* The name to resolve */
char *name;
- uint16_t type;
- /* the dns request id */
- int id; // FIXME can handle->request_id also be used here?
-
/* the request handle to reply to */
struct GNUNET_DNS_RequestHandle *request_handle;
+
+ /* the dns parser packet received */
+ struct GNUNET_DNSPARSER_Packet *packet;
+
+ /* the query parsed from the packet */
- /* hast this query been answered? */
+ struct GNUNET_DNSPARSER_Query *query;
+
+ /* has this query been answered? how many matches */
int answered;
/* the authoritative zone to query */
- GNUNET_HashCode *authority;
+ GNUNET_HashCode authority;
+
+ /* the name of the authoritative zone to query */
+ char *authority_name;
- /* we have an authority in namestore that
+ /**
+ * we have an authority in namestore that
* may be able to resolve
*/
int authority_found;
+
+ /* 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_DHT_Handle *dht_handle;
-struct GNUNET_TIME_Relative dht_update_interval;
-
/**
* Our zone's private key
*/
/**
* Our handle to the namestore service
+ * FIXME maybe need a second handle for iteration
*/
struct GNUNET_NAMESTORE_Handle *namestore_handle;
+/**
+ * Handle to iterate over our authoritative zone in namestore
+ */
+struct GNUNET_NAMESTORE_ZoneIterator *namestore_iter;
+
/**
* The configuration the GNS service is running with
*/
/**
* Our zone hash
*/
-GNUNET_HashCode *zone_hash;
+GNUNET_HashCode zone_hash;
/**
* Our tld. Maybe get from config file
*/
const char* gnunet_tld = ".gnunet";
+/**
+ * Useful for zone update for DHT put
+ */
+static int num_public_records = 3600;
+struct GNUNET_TIME_Relative dht_update_interval;
+GNUNET_SCHEDULER_TaskIdentifier zone_update_taskid = GNUNET_SCHEDULER_NO_TASK;
+
+/* 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 */
+ 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);
}
/**
- * FIXME
- * This is where it gets tricky
- * 1. we store (cache) all replies. Simple.
- * 2. If we see an authority "closer" to the name
- * we have to start a new query. Unless we get
- * a resolution.
- * It is important that the authority is closer
- * because else we might end up in an endless loop
- * (maybe keep track of queried keys?)
- * Of course we could just limit the resolution
- * with a timeout (makes sense for clients) but we need
- * to know when to stop querying.
- * 3. Also the name returned for the record here will probably
- * not match our name. How do we check this?
+ * Callback when record data is put into namestore
+ *
+ * @param cls the closure
+ * @param success GNUNET_OK on success
+ * @param emsg the error message. NULL if SUCCESS==GNUNET_OK
*/
void
+on_namestore_record_put_result(void *cls,
+ int32_t success,
+ const char *emsg)
+{
+ if (GNUNET_NO == success)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "records already in namestore\n");
+ return;
+ }
+ else if (GNUNET_YES == success)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "records successfully put in namestore\n");
+ return;
+ }
+
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ "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 cls the request handle
+ * @param exp lifetime
+ * @param key the key the record was stored under
+ * @param get_path get path
+ * @param get_path_length get path length
+ * @param put_path put path
+ * @param put_path_length put path length
+ * @param type the block type
+ * @param size the size of the record
+ * @param data the record data
+ */
+static void
process_authority_dht_result(void* cls,
struct GNUNET_TIME_Absolute exp,
const GNUNET_HashCode * key,
enum GNUNET_BLOCK_Type type,
size_t size, const void *data)
{
+ struct GNUNET_GNS_ResolverHandle *rh;
+ struct GNSNameRecordBlock *nrb;
+ 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)
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);
- /**
- * data is a serialized PKEY record (probably)
- * parse, put into namestore
- * namestore zone hash is in query.
- * Then adjust query->name and call resolve_name
- * with new zone (the one just received)
- *
- * query->authority = new_authority
- * resolve_name(query, new_authority);
- */
+ rh->get_handle = NULL;
+ num_records = ntohl(nrb->rd_count);
+ name = (char*)&nrb[1];
+ {
+ 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);
+ for (i=0; i<num_records; i++)
+ {
+
+ 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 */
+ 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;
+ resolve_name(rh);
+ return;
+ }
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "No authority in records\n");
+ reply_to_dns(rh, 0, NULL);
}
/**
* Start DHT lookup for a name -> PKEY (compare NS) record in
* query->authority's zone
*
- * @param query the pending gns query
+ * @param rh the pending gns query
* @param name the name of the PKEY record
*/
-void
-resolve_authority_dht(struct GNUNET_GNS_PendingQuery *query, 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_xor(&name_hash, query->authority, &lookup_key);
+ 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?
- 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,
- query);
+ rh);
}
-void
+/**
+ * Function called when we get a result from the dht
+ * for our query
+ *
+ * @param cls the request handle
+ * @param exp lifetime
+ * @param key the key the record was stored under
+ * @param get_path get path
+ * @param get_path_length get path length
+ * @param put_path put path
+ * @param put_path_length put path length
+ * @param type the block type
+ * @param size the size of the record
+ * @param data the record data
+ */
+static void
process_name_dht_result(void* cls,
struct GNUNET_TIME_Absolute exp,
const GNUNET_HashCode * key,
enum GNUNET_BLOCK_Type type,
size_t size, const void *data)
{
+ struct GNUNET_GNS_ResolverHandle *rh;
+ struct GNSNameRecordBlock *nrb;
+ 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;
- /**
- * data is a searialized GNS record of type
- * query->record_type. Parse and put into namestore
- * namestore zone hash is in query.
- * Check if record type and name match in query and reply
- * to dns!
- */
+ //FIXME maybe check expiration here, check block type
+
+ 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];
+
+ 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;
+ }
+
+ 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);
+
+ /**
+ * 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);
+ }
+
}
+
+
+
/**
- * Start DHT lookup for a name -> query->record_type record in
+ * Start DHT lookup for a (name -> query->record_type) record in
* query->authority's zone
*
- * @param query the pending gns query
+ * @param rh the pending gns query context
* @param name the name to query record
*/
-void
-resolve_name_dht(struct GNUNET_GNS_PendingQuery *query, const char* name)
+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_CRYPTO_hash(name, strlen(name), &name_hash);
- GNUNET_CRYPTO_hash_xor(&name_hash, query->authority, &lookup_key);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "A\n");
- timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20);
+ 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);
+
+ 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?
- 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,
- &query->type, //xquery
- sizeof(query->type),
+ &xquery,
+ sizeof(xquery),
&process_name_dht_result,
- query);
+ rh);
}
//Prototype
-void
-resolve_name(struct GNUNET_GNS_PendingQuery *query, GNUNET_HashCode *zone);
+static void
+resolve_name(struct GNUNET_GNS_ResolverHandle *rh);
/**
* This is a callback function that should give us only PKEY
- * records. Used to iteratively query the namestore for 'closest'
- * authority.
+ * records. Used to query the namestore for the authority (PKEY)
+ * for 'name'
*
* @param cls the pending query
- * @param zone our zone hash
+ * @param key the key of the zone we did the lookup
+ * @param expiration expiration date of the record data set in the namestore
* @param name the name for which we need an authority
- * @param record_type the type of record (PKEY)
- * @param expiration expiration date of the record
- * @param flags namestore record flags
- * @param sig_loc the location of the record in the signature tree
- * @param size the size of the record
- * @param data the record data
+ * @param rd_count the number of records with 'name'
+ * @param rd the record data
+ * @param signature the signature of the authority for the record data
*/
-void
-process_authority_lookup(void* cls, const GNUNET_HashCode *zone,
- const char *name, uint32_t record_type,
+static void
+process_authority_lookup(void* cls,
+ const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *key,
struct GNUNET_TIME_Absolute expiration,
- enum GNUNET_NAMESTORE_RecordFlags flags,
- const struct GNUNET_NAMESTORE_SignatureLocation *sig_loc,
- size_t size, const void *data)
+ const char *name,
+ unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd,
+ const struct GNUNET_CRYPTO_RsaSignature *signature)
{
- struct GNUNET_GNS_PendingQuery *query;
-
- query = (struct GNUNET_GNS_PendingQuery *)cls;
+ 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,
+ sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ &zone);
+ remaining_time = GNUNET_TIME_absolute_get_remaining (expiration);
/**
* No authority found in namestore.
*/
- if (NULL == data)
+ if (rd_count == 0)
{
- if (query->authority_found)
- {
- query->authority_found = 0;
- resolve_name(query, query->authority);
- return;
- }
-
/**
* We did not find an authority in the namestore
- * _IF_ the current authoritative zone is us.
- * we cannot resolve
- * _ELSE_ we cannot still check the dht
+ * _IF_ the current authoritative zone is us we cannot resolve
+ * _ELSE_ we can still check the _expired_ dht
*/
- if (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_INFO, "NX record\n");
- //FIXME return NX answer
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Authority %s unknown in namestore, trying dht\n",
+ rh->authority_name);
+ resolve_authority_dht(rh);
return;
}
-
- resolve_authority_dht(query, name);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Authority %s unknown\n",
+ rh->authority_name);
+ reply_to_dns(rh, 0, NULL);
return;
}
-
+
+ //Note only 1 pkey should have been returned.. anything else would be strange
/**
* We found an authority that may be able to help us
* move on with query
*/
- query->authority_found = 1;
- GNUNET_HashCode *key = (GNUNET_HashCode*) data; //FIXME i assume this works
- query->authority = key;
+ int i;
+ for (i=0; i<rd_count;i++)
+ {
+ if (rd[i].record_type != GNUNET_GNS_RECORD_PKEY)
+ continue;
+
+ 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 dht entry is expired. Refreshing\n");
+ resolve_authority_dht(rh);
+ }
+
+ 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_DEBUG,
+ "Authority lookup successful but no PKEY... never get here\n");
+ reply_to_dns(rh, 0, NULL);
}
/**
* Reply to client with the result from our lookup.
*
- * @param answer the pending query used in the lookup
+ * @param rh the request handle of the lookup
+ * @param rd_count the number of records to return
+ * @param rd the record data
*/
-void
-reply_to_dns(struct GNUNET_GNS_PendingQuery *answer)
+static void
+reply_to_dns(struct GNUNET_GNS_ResolverHandle *rh, uint32_t rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd)
{
- struct GNUNET_GNS_QueryRecordList *i;
- struct GNUNET_DNSPARSER_Packet *packet;
- struct GNUNET_DNSPARSER_Flags dnsflags;
- int j;
+ int i;
size_t len;
int ret;
char *buf;
+ struct GNUNET_DNSPARSER_Packet *packet = rh->packet;
+ struct GNUNET_DNSPARSER_Record answer_records[rh->answered];
+ struct GNUNET_DNSPARSER_Record additional_records[rd_count-(rh->answered)];
+ packet->answers = answer_records;
+ packet->additional_records = additional_records;
- packet = GNUNET_malloc(sizeof(struct GNUNET_DNSPARSER_Packet));
- packet->answers =
- GNUNET_malloc(sizeof(struct GNUNET_DNSPARSER_Record) * answer->num_records);
-
+ /**
+ * Put records in the DNS packet and modify it
+ * to a response
+ */
len = sizeof(struct GNUNET_DNSPARSER_Record*);
- j = 0;
- for (i=answer->records_head; i != NULL; i=i->next)
+ for (i=0; i < rd_count; i++)
{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Adding %s to DNS response\n", i->record->name);
- memcpy(&packet->answers[j],
- i->record,
- sizeof (struct GNUNET_DNSPARSER_Record));
- GNUNET_free(i->record);
- j++;
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Adding type %d to DNS response\n", rd[i].record_type);
+ 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;
+ answer_records[i].type = rd[i].record_type;
+ answer_records[i].data.raw.data_len = rd[i].data_size;
+ answer_records[i].data.raw.data = (char*)rd[i].data;
+ answer_records[i].expiration_time = rd[i].expiration;
+ answer_records[i].class = GNUNET_DNSPARSER_CLASS_INTERNET;//hmmn
+ }
+ else
+ {
+ additional_records[i].name = rh->query->name;
+ additional_records[i].type = rd[i].record_type;
+ additional_records[i].data.raw.data_len = rd[i].data_size;
+ additional_records[i].data.raw.data = (char*)rd[i].data;
+ additional_records[i].expiration_time = rd[i].expiration;
+ additional_records[i].class = GNUNET_DNSPARSER_CLASS_INTERNET;//hmmn
+ }
}
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "after memcpy\n");
- /* FIXME how to handle auth, additional etc */
- packet->num_answers = answer->num_records;
- packet->num_authority_records = answer->num_authority_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;
- dnsflags.authoritative_answer = 1;
- dnsflags.opcode = GNUNET_DNSPARSER_OPCODE_QUERY;
- dnsflags.return_code = GNUNET_DNSPARSER_RETURN_CODE_NO_ERROR; //not sure
- dnsflags.query_or_response = 1;
- packet->flags = dnsflags;
+ if (rd == NULL)
+ packet->flags.return_code = GNUNET_DNSPARSER_RETURN_CODE_NAME_ERROR;
+ else
+ packet->flags.return_code = GNUNET_DNSPARSER_RETURN_CODE_NO_ERROR;
+
+ packet->flags.query_or_response = 1;
- packet->id = answer->id;
- //FIXME this is silently discarded
+ /**
+ * 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,
- "Built DNS response! (ret=%d)\n", ret);
+ 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(answer->request_handle,
+ 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_free(answer);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Answered DNS request\n");
}
else
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
"Error building DNS response! (ret=%d)", ret);
}
+
+ 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 zone the zone of the lookup
- * @param name the name looked up
- * @param record_type the record type
- * @param expiration lifetime of the record
- * @param flags record flags
- * @param sig_loc location of the record in the signature tree
- * @param size the size of the record
- * @param data the record data
+ * @param key the key of the zone we did the lookup
+ * @param expiration expiration date of the namestore entry
+ * @param name the name for which we need an authority
+ * @param rd_count the number of records with 'name'
+ * @param rd the record data
+ * @param signature the signature of the authority for the record data
*/
static void
-process_authoritative_result(void* cls, const GNUNET_HashCode *zone,
- const char *name, uint32_t record_type,
+process_authoritative_result(void* cls,
+ const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *key,
struct GNUNET_TIME_Absolute expiration,
- enum GNUNET_NAMESTORE_RecordFlags flags,
- const struct GNUNET_NAMESTORE_SignatureLocation *sig_loc,
- size_t size, const void *data)
+ const char *name, unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd,
+ const struct GNUNET_CRYPTO_RsaSignature *signature)
{
- struct GNUNET_GNS_PendingQuery *query;
- struct GNUNET_GNS_QueryRecordList *qrecord;
- struct GNUNET_DNSPARSER_Record *record;
- query = (struct GNUNET_GNS_PendingQuery *) cls;
+ struct GNUNET_GNS_ResolverHandle *rh;
+ struct GNUNET_TIME_Relative remaining_time;
+ GNUNET_HashCode zone;
+ rh = (struct GNUNET_GNS_ResolverHandle *) cls;
+ GNUNET_CRYPTO_hash(key,
+ sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ &zone);
+ remaining_time = GNUNET_TIME_absolute_get_remaining (expiration);
- if (NULL == data)
+ if (rd_count == 0)
{
/**
- * FIXME
- * Lookup terminated
- * Do we have what we need to answer?
- * If not -> DHT Phase
- * if full_name == next_name and not anwered we cannot resolve
+ * Lookup terminated and no results
+ * -> DHT Phase unless data is recent
*/
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Namestore lookup terminated. (answered=%d)", query->answered);
- if (query->answered)
- {
- reply_to_dns(query);
- return;
- }
-
+ 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))
{
- //FIXME todo
- resolve_name_dht(query, name);
- return;
+ if (remaining_time.rel_value == 0)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "trying dht...\n");
+ resolve_name_dht(rh, rh->name);
+ return;
+ }
+ else
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Record is still recent. No DHT lookup\n");
+ }
}
/**
* Our zone and no result? Cannot resolve TT
- * FIXME modify query to say NX
*/
+ GNUNET_assert(rh->answered == 0);
+ reply_to_dns(rh, 0, NULL);
return;
}
else
{
- /**
- * Record found
- */
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Processing additional result for %s from namestore\n", name);
-
- qrecord = GNUNET_malloc(sizeof(struct GNUNET_GNS_QueryRecordList));
- record = GNUNET_malloc(sizeof(struct GNUNET_DNSPARSER_Record));
- qrecord->record = record;
-
- record->name = (char*)query->original_name;
-
- /**
- * FIXME for gns records this requires the dnsparser to be modified!
- * or use RAW. But RAW data need serialization!
- * maybe store record data appropriately in namestore to avoid a
- * huge switch statement?
- */
- if (record_type == GNUNET_DNSPARSER_TYPE_A)
- {
- record->data.raw.data = (char*)data;
- record->data.raw.data_len = size;
- }
- record->expiration_time = expiration;
- record->type = record_type;
- record->class = GNUNET_DNSPARSER_CLASS_INTERNET; /* srsly? */
- //FIXME authoritative answer if we find a result in namestore
- if (flags == GNUNET_NAMESTORE_RF_AUTHORITY)
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Processing additional result %s from namestore\n", name);
+ int i;
+ for (i=0; i<rd_count;i++)
{
- //query->num_authority_records++;
+
+ 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)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "This record is expired. Skipping\n");
+ continue;
+ }
+
+ rh->answered++;
+
}
/**
- * This seems to take into account that the result could
- * be different in name and or record type...
- * but to me this does not make sense
+ * no answers found
+ * consult dht if expired
*/
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Found answer to query!\n");
- query->answered = 1;
-
- query->num_records++;
+ if ((remaining_time.rel_value == 0) && (rh->answered == 0))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "This dht entry is old. Refreshing.\n");
+ resolve_name_dht(rh, name);
+ return;
+ }
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Found %d answer(s) to query!\n",
+ rh->answered);
- /**
- * FIXME watch for leaks
- * properly free pendingquery when the time comes
- */
- GNUNET_CONTAINER_DLL_insert(query->records_head,
- query->records_tail,
- qrecord);
+ reply_to_dns(rh, rd_count, rd);
}
}
-int
+/**
+ * Determine if this name is canonical.
+ * i.e.
+ * a.b.gnunet = not canonical
+ * a = canonical
+ *
+ * @param name the name to test
+ * @return 1 if canonical
+ */
+static int
is_canonical(char* name)
{
uint32_t len = strlen(name);
return 1;
}
-char* move_up(char* name)
+/**
+ * Move one level up in the domain hierarchy and return the
+ * passed top level domain.
+ *
+ * @param name the domain
+ * @return the tld
+ */
+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);
}
-void
-resolve_name(struct GNUNET_GNS_PendingQuery *query, GNUNET_HashCode *zone)
+
+/**
+ * The first phase of resolution.
+ * First check if the name is canonical.
+ * If it is then try to resolve directly.
+ * If not then we first have to resolve the authoritative entities.
+ *
+ * @param rh the pending lookup
+ */
+static void
+resolve_name(struct GNUNET_GNS_ResolverHandle *rh)
{
- if (is_canonical(query->name))
+ if (is_canonical(rh->name))
{
- //We only need to check this zone's ns
- GNUNET_NAMESTORE_lookup_name(namestore_handle,
- zone,
- query->name,
- query->type,
+ /* We only need to check the current zone's ns */
+ GNUNET_NAMESTORE_lookup_record(namestore_handle,
+ &rh->authority,
+ rh->name,
+ rh->query->type,
&process_authoritative_result,
- query);
+ rh);
}
else
{
- //We have to resolve the authoritative entity
- char *new_authority = move_up(query->name);
- GNUNET_NAMESTORE_lookup_name(namestore_handle,
- zone,
- new_authority,
+ /* We have to resolve the authoritative entity first */
+ rh->authority_name = pop_tld(rh->name);
+ GNUNET_NAMESTORE_lookup_record(namestore_handle,
+ &rh->authority,
+ rh->authority_name,
GNUNET_GNS_RECORD_PKEY,
&process_authority_lookup,
- query);
+ rh);
}
}
/**
- * Phase 1 of name resolution
- * Lookup local namestore. If we find a match there we can
- * provide an authoritative answer without the dht.
- * If we don't we have to start querying the dht.
+ * Entry point for name resolution
+ * Setup a new query and try to resolve
*
- * FIXME now it is possible that we have a foreign zone (or even the result)
- * cached in our namestore. Look up as well? We need a list of cached zones
- * then.
- *
- * @param rh the request handle of the DNS request from a client
- * @param name the name to look up
- * @param id the id of the dns request (for the reply)
- * @param type the record type to look for
+ * @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
-start_resolution(struct GNUNET_DNS_RequestHandle *rh,
- char* name, uint16_t id, uint16_t type)
+static void
+start_resolution(struct GNUNET_DNS_RequestHandle *request,
+ struct GNUNET_DNSPARSER_Packet *p,
+ struct GNUNET_DNSPARSER_Query *q)
{
- struct GNUNET_GNS_PendingQuery *query;
+ struct GNUNET_GNS_ResolverHandle *rh;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting resolution for %s (type=%d)!\n",
+ q->name, q->type);
- //FIXME remove .gnunet here from name
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "This is .gnunet (%s)!\n", name);
- query = GNUNET_malloc(sizeof (struct GNUNET_GNS_PendingQuery));
- query->id = id;
- query->original_name = name; //Full name of original query
+ rh = GNUNET_malloc(sizeof (struct GNUNET_GNS_ResolverHandle));
+ rh->packet = p;
+ rh->query = q;
+ rh->authority = zone_hash;
- //FIXME do not forget to free!!
- query->name = GNUNET_malloc(strlen(name)-strlen(gnunet_tld) + 1);
- memset(query->name, 0, strlen(name)-strlen(gnunet_tld) + 1);
- memcpy(query->name, name, strlen(name)-strlen(gnunet_tld));
+ rh->name = GNUNET_malloc(strlen(q->name)
+ - strlen(gnunet_tld) + 1);
+ memset(rh->name, 0,
+ strlen(q->name)-strlen(gnunet_tld) + 1);
+ memcpy(rh->name, q->name,
+ strlen(q->name)-strlen(gnunet_tld));
- query->type = type;
- query->request_handle = rh;
+ rh->request_handle = request;
- //Start resolution in our zone
- resolve_name(query, zone_hash);
+ /* 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,
const char *request)
{
struct GNUNET_DNSPARSER_Packet *p;
- int i;
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;
* The way it is implemented here now is buggy and will lead to erratic
* behaviour (if multiple queries are present).
*/
- for (i=0;i<p->num_queries;i++)
+ if (p->num_queries == 0)
{
- tldoffset = p->queries[i].name + strlen(p->queries[i].name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "No Queries in DNS packet... forwarding\n");
+ GNUNET_DNS_request_forward (rh);
+ }
- while ((*tldoffset) != '.')
- tldoffset--;
-
- if (0 == strcmp(tldoffset, gnunet_tld))
- {
- start_resolution(rh, p->queries[i].name, p->id, p->queries[i].type);
- }
- else
- {
- /**
- * This request does not concern us. Forward to real DNS.
- */
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Request for %s is forwarded to DNS\n", p->queries[i].name);
- GNUNET_DNS_request_forward (rh);
- }
+ if (p->num_queries > 1)
+ {
+ /* 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) != '.')
+ tldoffset--;
+
+ if (0 == strcmp(tldoffset, gnunet_tld))
+ {
+ start_resolution(rh, p, p->queries);
+ }
+ else
+ {
+ /**
+ * This request does not concern us. Forward to real DNS.
+ */
+ 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)
{
- /* put a few records into namestore */
- char* ipA = "1.2.3.4";
- char* ipB = "5.6.7.8";
- struct in_addr *alice = GNUNET_malloc(sizeof(struct in_addr));
- struct in_addr *bob = GNUNET_malloc(sizeof(struct in_addr));
- GNUNET_assert(1 == inet_pton (AF_INET, ipA, alice));
- GNUNET_assert(1 == inet_pton (AF_INET, ipB, bob));
- GNUNET_NAMESTORE_record_put (namestore_handle,
- zone_hash,
- "alice",
- GNUNET_GNS_RECORD_TYPE_A,
- GNUNET_TIME_absolute_get_forever(),
- GNUNET_NAMESTORE_RF_AUTHORITY,
- NULL, //sig loc
- sizeof(struct in_addr),
- alice,
- NULL,
- NULL);
- GNUNET_NAMESTORE_record_put (namestore_handle,
- zone_hash,
- "bob",
- GNUNET_GNS_RECORD_TYPE_A,
- GNUNET_TIME_absolute_get_forever(),
- GNUNET_NAMESTORE_RF_AUTHORITY,
- NULL, //sig loc
- sizeof(struct in_addr),
- bob,
- NULL,
- NULL);
+ GNUNET_NAMESTORE_zone_iterator_next(namestore_iter);
}
-//Prototype... needed in put function
+/**
+ * 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_log(GNUNET_ERROR_TYPE_DEBUG, "put request transmitted\n");
+}
+
+/* prototype */
static void
-update_zone_dht(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+update_zone_dht_start(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
/**
* Function used to put all records successively into the DHT.
- * FIXME also serializes records. maybe do this somewhere else...
- * FIXME don't store private records (maybe zone transfer does this)
*
* @param cls the closure (NULL)
- * @param zone our root zone hash
- * @param name the name of the record
- * @param record_type the type of the record
- * @param expiration lifetime of the record
- * @param flags flags of the record
- * @param sig_loc location of record in signature tree
- * @param size size of the record
- * @param record_data the record data
+ * @param key the public key of the authority (ours)
+ * @param expiration lifetime of the namestore entry
+ * @param name the name of the records
+ * @param rd_count the number of records in data
+ * @param rd the record data
+ * @param signature the signature for the record data
*/
-void
-put_gns_record(void *cls, const GNUNET_HashCode *zone, const char *name,
- uint32_t record_type, struct GNUNET_TIME_Absolute expiration,
- enum GNUNET_NAMESTORE_RecordFlags flags,
- const struct GNUNET_NAMESTORE_SignatureLocation *sig_loc,
- size_t size, const void *record_data)
+static void
+put_gns_record(void *cls,
+ const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *key,
+ struct GNUNET_TIME_Absolute expiration,
+ const char *name,
+ unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd,
+ const struct GNUNET_CRYPTO_RsaSignature *signature)
{
- struct GNUNET_TIME_Relative timeout;
-
- char* data;
- char* data_ptr;
- struct GNUNET_TIME_AbsoluteNBO exp_nbo;
- exp_nbo = GNUNET_TIME_absolute_hton (expiration);
- uint32_t namelen = htonl(strlen(name));
- uint16_t flags_nbo = htons(flags);
- uint64_t offset = GNUNET_htonll(sig_loc->offset);
- uint32_t depth = htonl(sig_loc->depth);
- uint32_t revision = htonl(sig_loc->revision);
+
+ struct GNSNameRecordBlock *nrb;
GNUNET_HashCode name_hash;
GNUNET_HashCode xor_hash;
+ struct GNUNET_CRYPTO_HashAsciiEncoded xor_hash_string;
+ uint32_t rd_payload_length;
+ char* nrb_data = NULL;
- /**
- * I guess this can be done prettier
- * FIXME extract into function, maybe even into different file
- */
- size_t record_len = sizeof(size_t) + sizeof(uint32_t) +
- sizeof(uint16_t) +
- sizeof(struct GNUNET_NAMESTORE_SignatureLocation) +
- sizeof(uint32_t) + strlen(name) + size;
+ /* we're done */
+ if (NULL == name)
+ {
+ 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;
+ }
- record_type = htonl(record_type);
-
- data = GNUNET_malloc(record_len);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Putting records for %s into the DHT\n", name);
- /* -_- */
- data_ptr = data;
- memcpy(data_ptr, &namelen, sizeof(size_t));
- data_ptr += sizeof(size_t);
-
- memcpy(data_ptr, name, namelen);
- data_ptr += namelen;
+ rd_payload_length = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
- memcpy(data_ptr, &record_type, sizeof(uint32_t));
- data_ptr += sizeof(uint32_t);
-
- memcpy(data_ptr, &exp_nbo, sizeof(struct GNUNET_TIME_AbsoluteNBO));
- data_ptr += sizeof(struct GNUNET_TIME_AbsoluteNBO);
+ nrb = GNUNET_malloc(rd_payload_length + strlen(name) + 1
+ + sizeof(struct GNSNameRecordBlock));
+
+ if (signature != NULL)
+ nrb->signature = *signature;
+
+ nrb->public_key = *key;
- memcpy(data_ptr, &flags_nbo, sizeof(uint16_t));
- data_ptr += sizeof(uint16_t);
+ nrb->rd_count = htonl(rd_count);
+
+ memset(&nrb[1], 0, strlen(name) + 1);
+ memcpy(&nrb[1], name, strlen(name));
- memcpy(data_ptr, &offset, sizeof(uint64_t));
- data_ptr += sizeof(uint64_t);
+ nrb_data = (char*)&nrb[1];
+ nrb_data += strlen(name) + 1;
- memcpy(data_ptr, &depth, sizeof(uint32_t));
- data_ptr += sizeof(uint32_t);
-
- memcpy(data_ptr, &revision, sizeof(uint32_t));
- data_ptr += sizeof(uint32_t);
+ rd_payload_length += sizeof(struct GNSNameRecordBlock) +
+ strlen(name) + 1;
- memcpy(data_ptr, &size, sizeof(uint32_t));
- data_ptr += sizeof(uint32_t);
+ if (-1 == GNUNET_NAMESTORE_records_serialize (rd_count,
+ rd,
+ rd_payload_length,
+ nrb_data))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n");
+ return;
+ //FIXME what to do
+ }
- /**
- * FIXME note that this only works with raw data in nbo
- * write helper function that converts properly and returns buffer
- */
- memcpy(data_ptr, record_data, size);
- data_ptr += size;
- /*Doing this made me sad...*/
- /**
- * 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_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
- (data_ptr-data),
- data,
- expiration, //FIXME from record makes sense? is absolute?
- timeout,
- NULL, //FIXME continuation needed? success check? yes ofc
+ GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
+ rd_payload_length,
+ (char*)nrb,
+ expiration,
+ DHT_OPERATION_TIMEOUT,
+ &record_dht_put,
NULL); //cls for cont
+
+ num_public_records++;
/**
* Reschedule periodic put
*/
- GNUNET_SCHEDULER_add_delayed (dht_update_interval,
- &update_zone_dht,
+ zone_update_taskid = GNUNET_SCHEDULER_add_delayed (dht_update_interval,
+ &update_zone_dht_next,
NULL);
}
* @param tc task context
*/
static void
-update_zone_dht(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+update_zone_dht_start(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_NAMESTORE_zone_transfer (namestore_handle, zone_hash,
- &put_gns_record,
- NULL);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Starting DHT zone update!\n");
+ if (0 == num_public_records)
+ {
+ dht_update_interval = GNUNET_TIME_relative_multiply(
+ GNUNET_TIME_UNIT_SECONDS,
+ 1);
+ }
+ else
+ {
+ dht_update_interval = GNUNET_TIME_relative_multiply(
+ GNUNET_TIME_UNIT_SECONDS,
+ (3600/num_public_records));
+ }
+ num_public_records = 0; //start counting again
+ namestore_iter = GNUNET_NAMESTORE_zone_iteration_start (namestore_handle,
+ &zone_hash,
+ GNUNET_NAMESTORE_RF_AUTHORITY,
+ GNUNET_NAMESTORE_RF_PRIVATE,
+ &put_gns_record,
+ NULL);
}
/**
const struct GNUNET_CONFIGURATION_Handle *c)
{
- zone_key = GNUNET_CRYPTO_rsa_key_create ();
- GNUNET_CRYPTO_hash(zone_key, GNUNET_CRYPTO_RSA_KEY_LENGTH,//FIXME is this ok?
- zone_hash);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Initializing GNS\n");
- nc = GNUNET_SERVER_notification_context_create (server, 1);
+ char* keyfile;
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
- /* FIXME - do some config parsing
- * - Maybe only hijack dns if option is set (HIJACK_DNS=1)
- */
+ 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);
+ GNUNET_CRYPTO_rsa_key_get_public (zone_key, &pkey);
+
+ GNUNET_CRYPTO_hash(&pkey, sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ &zone_hash);
+
+ nc = GNUNET_SERVER_notification_context_create (server, 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
* for our records
+ * We have roughly an hour for all records;
*/
dht_update_interval = GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS,
- 60); //FIXME from cfg
- GNUNET_SCHEDULER_add_delayed (dht_update_interval,
- &update_zone_dht,
- NULL);
+ 1);
+ //zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_start, NULL);
}
projects / oweals / gnunet.git / blobdiff