*/
/**
- *
- * TODO:
- * - Write xquery and block plugin
- * - Think about mixed dns queries (.gnunet and .org)
- * - The smaller FIXME issues all around
*
* @file gns/gnunet-service-gns.c
* @brief GNUnet GNS service
#include "gnunet_dht_service.h"
#include "gnunet_namestore_service.h"
#include "gnunet_gns_service.h"
+#include "block_gns.h"
#include "gns.h"
+#include "gnunet-service-gns_resolver.h"
+#include "gnunet-service-gns_interceptor.h"
-/* 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
+/* FIXME move to proper header in include */
+#define GNUNET_MESSAGE_TYPE_GNS_LOOKUP 23
+#define GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT 24
+#define GNUNET_MESSAGE_TYPE_GNS_SHORTEN 25
+#define GNUNET_MESSAGE_TYPE_GNS_SHORTEN_RESULT 26
+#define GNUNET_MESSAGE_TYPE_GNS_GET_AUTH 27
+#define GNUNET_MESSAGE_TYPE_GNS_GET_AUTH_RESULT 28
-struct GNUNET_GNS_QueryRecordList
-{
- /**
- * DLL
- */
- struct GNUNET_GNS_QueryRecordList * next;
- struct GNUNET_GNS_QueryRecordList * prev;
-
- struct GNUNET_NAMESTORE_RecordData * record;
-};
/**
- * A result list for namestore queries
+ * Handle to a shorten operation from api
*/
-struct GNUNET_GNS_PendingQuery
+struct ClientShortenHandle
{
- /* the answer packet */
- struct GNUNET_DNSPARSER_Packet *answer;
+ /* the requesting client that */
+ struct GNUNET_SERVER_Client *client;
- /* records to put into answer packet */
- struct GNUNET_GNS_QueryRecordList * records_head;
- struct GNUNET_GNS_QueryRecordList * records_tail;
+ /* request id */
+ uint64_t unique_id;
- int num_records;
- int num_authority_records; //FIXME are all of our replies auth?
-
- char *original_name;
- char *name;
+ /* request type */
+ enum GNUNET_GNS_RecordType type;
- uint16_t type;
- /* the dns request id */
- int id; // FIXME can handle->request_id also be used here?
+ /* name to shorten */
+ char* name;
+
+};
- /* the request handle to reply to */
- struct GNUNET_DNS_RequestHandle *request_handle;
- /* hast this query been answered? */
- int answered;
+/**
+ * Handle to a get auhtority operation from api
+ */
+struct ClientGetAuthHandle
+{
+ /* the requesting client that */
+ struct GNUNET_SERVER_Client *client;
- /* the authoritative zone to query */
- GNUNET_HashCode *authority;
+ /* request id */
+ uint64_t unique_id;
+
+ /* name to lookup authority */
+ char* name;
- /* we have an authority in namestore that
- * may be able to resolve
- */
- int authority_found;
};
/**
- * Our handle to the DNS handler library
+ * Handle to a lookup operation from api
*/
-struct GNUNET_DNS_Handle *dns_handle;
+struct ClientLookupHandle
+{
+ /* the requesting client that */
+ struct GNUNET_SERVER_Client *client;
+
+ /* request id */
+ uint64_t unique_id;
+
+ /* request type */
+ enum GNUNET_GNS_RecordType type;
+
+ /* the name to look up */
+ char* name; //Needed?
+};
/**
* Our handle to the DHT
*/
-struct GNUNET_DHT_Handle *dht_handle;
+static struct GNUNET_DHT_Handle *dht_handle;
/**
* 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;
/**
/**
* Our zone hash
*/
-GNUNET_HashCode zone_hash;
+struct GNUNET_CRYPTO_ShortHashCode zone_hash;
/**
- * Our tld. Maybe get from config file
+ * Useful for zone update for DHT put
*/
-const char* gnunet_tld = ".gnunet";
+static int num_public_records = 3600;
/**
- * Useful for zone update for DHT put
+ * update interval in seconds
*/
-static int num_public_records = 3600;
-struct GNUNET_TIME_Relative dht_update_interval;
+static unsigned long long int dht_max_update_interval;
+/* dht update interval FIXME define? */
+static struct GNUNET_TIME_Relative dht_update_interval;
-void reply_to_dns(struct GNUNET_GNS_PendingQuery *answer, uint32_t rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd);
-void resolve_name(struct GNUNET_GNS_PendingQuery *query,
- GNUNET_HashCode *zone);
+/* zone update task */
+GNUNET_SCHEDULER_TaskIdentifier zone_update_taskid = GNUNET_SCHEDULER_NO_TASK;
+
+/* automatic pkey import for name shortening */
+static int auto_import_pkey;
+
+/* lookup timeout */
+static struct GNUNET_TIME_Relative default_lookup_timeout;
/**
- * Task run during shutdown.
- *
- * @param cls unused
- * @param tc unused
+ * Continue shutdown
*/
static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+on_resolver_cleanup(void)
{
- GNUNET_DNS_disconnect(dns_handle);
- GNUNET_NAMESTORE_disconnect(namestore_handle, 0);
+ GNUNET_NAMESTORE_disconnect(namestore_handle, 1);
GNUNET_DHT_disconnect(dht_handle);
}
-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);
-}
-
/**
- * Function called when we get a result from the dht
- * for our query
+ * Task run during shutdown.
*
- * @param cls the query 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
+ * @param cls unused
+ * @param tc unused
*/
-void
-process_authority_dht_result(void* cls,
- struct GNUNET_TIME_Absolute exp,
- const GNUNET_HashCode * key,
- const struct GNUNET_PeerIdentity *get_path,
- unsigned int get_path_length,
- const struct GNUNET_PeerIdentity *put_path,
- unsigned int put_path_length,
- enum GNUNET_BLOCK_Type type,
- size_t size, const void *data)
+static void
+shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GNUNET_GNS_PendingQuery *query;
- uint32_t num_records;
- uint16_t namelen;
- char* name = NULL;
- struct GNUNET_CRYPTO_RsaSignature *signature;
- int i;
- char* pos;
- GNUNET_HashCode zone, name_hash;
-
- if (data == NULL)
- return;
-
- query = (struct GNUNET_GNS_PendingQuery *)cls;
- pos = (char*)data;
-
- num_records = ntohl(*pos);
- struct GNUNET_NAMESTORE_RecordData rd[num_records];
- pos += sizeof(uint32_t);
-
- for (i=0; i<num_records; i++)
- {
- namelen = ntohs(*pos);
- pos += sizeof(uint16_t);
-
- //name must be 0 terminated
- name = pos;
- pos += namelen;
-
- rd[i].record_type = ntohl(*pos);
- pos += sizeof(uint32_t);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Shutting down!");
+ /* Kill zone task for it may make the scheduler hang */
+ if (zone_update_taskid)
+ GNUNET_SCHEDULER_cancel(zone_update_taskid);
- rd[i].data_size = ntohl(*pos);
- pos += sizeof(uint32_t);
+ GNUNET_SERVER_notification_context_destroy (nc);
- rd[i].data = pos;
- pos += rd[i].data_size;
-
- rd[i].expiration = GNUNET_TIME_absolute_ntoh(
- *((struct GNUNET_TIME_AbsoluteNBO*)pos));
- pos += sizeof(struct GNUNET_TIME_AbsoluteNBO);
-
- rd[i].flags = ntohs(*pos);
- pos += sizeof(uint16_t);
- //FIXME class?
- //
- if (strcmp(name, query->name) && rd[i].record_type == query->type)
- {
- query->answered = 1;
- }
+ gns_interceptor_stop();
+ gns_resolver_cleanup(&on_resolver_cleanup);
- }
+}
- if ((((char*)data)-pos) < sizeof(struct GNUNET_CRYPTO_RsaSignature))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Cannot parse signature in DHT response. Corrupted or Missing");
- return;
- }
- signature = (struct GNUNET_CRYPTO_RsaSignature*)pos;
-
- 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,
- &zone,
- name,
- exp,
- num_records,
- rd,
- signature,
- &on_namestore_record_put_result, //cont
- NULL); //cls
-
- if (query->answered)
- {
- query->answered = 0;
- memcpy(query->authority, &zone, sizeof(GNUNET_HashCode));
- resolve_name(query, query->authority);
- }
- /**
- * 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);
- */
+/**
+ * Method called periodicattluy that triggers
+ * iteration over root zone
+ *
+ * @param cls closure
+ * @param tc task context
+ */
+static void
+update_zone_dht_next(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_NAMESTORE_zone_iterator_next(namestore_iter);
}
/**
- * Start DHT lookup for a name -> PKEY (compare NS) record in
- * query->authority's zone
+ * Continuation for DHT put
*
- * @param query the pending gns query
- * @param name the name of the PKEY record
+ * @param cls closure
+ * @param tc task context
*/
-void
-resolve_authority_dht(struct GNUNET_GNS_PendingQuery *query, const char* name)
+static void
+record_dht_put(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- enum GNUNET_GNS_RecordType rtype = GNUNET_GNS_RECORD_PKEY;
- struct GNUNET_TIME_Relative timeout;
- 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);
-
- timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20);
-
- //FIXME how long to wait for results?
- GNUNET_DHT_get_start(dht_handle, timeout,
- GNUNET_BLOCK_TYPE_TEST, //FIXME todo
- &lookup_key,
- 5, //Replication level FIXME
- GNUNET_DHT_RO_NONE,
- &rtype, //xquery FIXME this is bad
- sizeof(GNUNET_GNS_RECORD_PKEY),
- &process_authority_dht_result,
- query);
-
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "put request transmitted\n");
}
+/* prototype */
+static void
+update_zone_dht_start(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+
/**
- * Function called when we get a result from the dht
- * for our query
+ * Function used to put all records successively into the DHT.
*
- * @param cls the query 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
+ * @param cls the closure (NULL)
+ * @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
-process_name_dht_result(void* cls,
- struct GNUNET_TIME_Absolute exp,
- const GNUNET_HashCode * key,
- const struct GNUNET_PeerIdentity *get_path,
- unsigned int get_path_length,
- const struct GNUNET_PeerIdentity *put_path,
- unsigned int put_path_length,
- enum GNUNET_BLOCK_Type type,
- size_t size, const void *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_GNS_PendingQuery *query;
- uint32_t num_records;
- uint16_t namelen;
- char* name = NULL;
- struct GNUNET_CRYPTO_RsaSignature *signature;
- int i;
- char* pos;
- GNUNET_HashCode zone, name_hash;
-
- if (data == NULL)
+
+ struct GNSNameRecordBlock *nrb;
+ struct GNUNET_CRYPTO_ShortHashCode name_hash;
+ GNUNET_HashCode xor_hash;
+ GNUNET_HashCode name_hash_double;
+ GNUNET_HashCode zone_hash_double;
+ struct GNUNET_CRYPTO_HashAsciiEncoded xor_hash_string;
+ uint32_t rd_payload_length;
+ char* nrb_data = NULL;
+ size_t namelen;
+
+ /* we're done */
+ if (NULL == name)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Zone iteration finished. Rescheduling put in %ds\n",
+ dht_max_update_interval);
+ zone_update_taskid = GNUNET_SCHEDULER_add_delayed (
+ GNUNET_TIME_relative_multiply(
+ GNUNET_TIME_UNIT_SECONDS,
+ dht_max_update_interval
+ ),
+ &update_zone_dht_start,
+ NULL);
return;
+ }
- query = (struct GNUNET_GNS_PendingQuery *)cls;
- pos = (char*)data;
+ namelen = strlen(name) + 1;
- num_records = ntohl(*pos);
- struct GNUNET_NAMESTORE_RecordData rd[num_records];
+ if (signature == NULL)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ "No signature for %s record data provided! Skipping...\n",
+ name);
+ zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_next,
+ NULL);
+ return;
- pos += sizeof(uint32_t);
+ }
- for (i=0; i<num_records; i++)
- {
- namelen = ntohs(*pos);
- pos += sizeof(uint16_t);
-
- //name must be 0 terminated
- name = pos;
- pos += namelen;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Putting records for %s into the DHT\n", name);
- rd[i].record_type = ntohl(*pos);
- pos += sizeof(uint32_t);
+ rd_payload_length = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
- rd[i].data_size = ntohl(*pos);
- pos += sizeof(uint32_t);
+ nrb = GNUNET_malloc(rd_payload_length + namelen
+ + sizeof(struct GNSNameRecordBlock));
- rd[i].data = pos;
- pos += rd[i].data_size;
-
- rd[i].expiration = GNUNET_TIME_absolute_ntoh(
- *((struct GNUNET_TIME_AbsoluteNBO*)pos));
- pos += sizeof(struct GNUNET_TIME_AbsoluteNBO);
-
- rd[i].flags = ntohs(*pos);
- pos += sizeof(uint16_t);
- //FIXME class?
- //
- if (strcmp(name, query->name) && rd[i].record_type == query->type)
- {
- query->answered = 1;
- }
+ nrb->signature = *signature;
+
+ nrb->public_key = *key;
- }
+ nrb->rd_count = htonl(rd_count);
+
+ memcpy(&nrb[1], name, namelen);
+
+ nrb_data = (char*)&nrb[1];
+ nrb_data += namelen;
- if ((((char*)data)-pos) < sizeof(struct GNUNET_CRYPTO_RsaSignature))
+ rd_payload_length += sizeof(struct GNSNameRecordBlock) + namelen;
+
+ if (-1 == GNUNET_NAMESTORE_records_serialize (rd_count,
+ rd,
+ rd_payload_length,
+ nrb_data))
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Cannot parse signature in DHT response. Corrupted or Missing");
+ "Record serialization failed! Skipping...\n");
+ GNUNET_free(nrb);
+ zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_next,
+ NULL);
return;
}
- signature = (struct GNUNET_CRYPTO_RsaSignature*)pos;
-
- 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,
- &zone,
- name,
- exp,
- num_records,
- rd,
- signature,
- &on_namestore_record_put_result, //cont
- NULL); //cls
+
+ /*
+ * calculate DHT key: H(name) xor H(pubkey)
+ */
+ GNUNET_CRYPTO_short_hash(name, strlen(name), &name_hash);
+ GNUNET_CRYPTO_short_hash_double (&name_hash, &name_hash_double);
+ GNUNET_CRYPTO_short_hash_double (&zone_hash, &zone_hash_double);
+ GNUNET_CRYPTO_hash_xor(&zone_hash_double, &name_hash_double, &xor_hash);
+ GNUNET_CRYPTO_hash_to_enc (&xor_hash, &xor_hash_string);
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "putting records for %s under key: %s with size %d\n",
+ name, (char*)&xor_hash_string, rd_payload_length);
- if (query->answered)
- {
- //FIXME: add records to query handle, but on stack!
- //do we need records in query handle? can't we just
- //pass them to reply_to_dns?
- reply_to_dns(query, num_records, rd);
- }
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "DHT req to %d\n", DHT_OPERATION_TIMEOUT.rel_value);
+
+ GNUNET_DHT_put (dht_handle, &xor_hash,
+ DHT_GNS_REPLICATION_LEVEL,
+ GNUNET_DHT_RO_NONE,
+ GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
+ rd_payload_length,
+ (char*)nrb,
+ expiration,
+ DHT_OPERATION_TIMEOUT,
+ &record_dht_put,
+ NULL); //cls for cont
+
+ num_public_records++;
/**
- * data is a serialized GNS record of type
- * Check if record type and name match in query and reply
- * to dns!
+ * Reschedule periodic put
*/
+ zone_update_taskid = GNUNET_SCHEDULER_add_delayed (dht_update_interval,
+ &update_zone_dht_next,
+ NULL);
+
+ GNUNET_free(nrb);
+
}
/**
- * Start DHT lookup for a (name -> query->record_type) record in
- * query->authority's zone
+ * Periodically iterate over our zone and store everything in dht
*
- * @param query the pending gns query
- * @param name the name to query record
+ * @param cls NULL
+ * @param tc task context
*/
-void
-resolve_name_dht(struct GNUNET_GNS_PendingQuery *query, const char* name)
+static void
+update_zone_dht_start(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GNUNET_TIME_Relative timeout;
- 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);
-
- timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20);
-
- //FIXME how long to wait for results?
- GNUNET_DHT_get_start(dht_handle, timeout,
- GNUNET_BLOCK_TYPE_TEST, //FIXME todo
- &lookup_key,
- 5, //Replication level FIXME
- GNUNET_DHT_RO_NONE,
- &query->type, //xquery
- sizeof(query->type),
- &process_name_dht_result,
- query);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Scheduling DHT zone update!\n");
+ if (0 == num_public_records)
+ {
+ dht_update_interval = GNUNET_TIME_relative_multiply(
+ GNUNET_TIME_UNIT_SECONDS,
+ dht_max_update_interval);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "No records in db. Adjusted DHT update interval to %ds\n",
+ dht_max_update_interval);
+ }
+ else
+ {
+
+ dht_update_interval = GNUNET_TIME_relative_multiply(
+ GNUNET_TIME_UNIT_SECONDS,
+ (dht_max_update_interval/num_public_records));
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Adjusted DHT update interval to %ds!\n",
+ (dht_max_update_interval/num_public_records));
+ }
+ /* start counting again */
+ num_public_records = 0;
+ namestore_iter = GNUNET_NAMESTORE_zone_iteration_start (namestore_handle,
+ &zone_hash,
+ GNUNET_NAMESTORE_RF_AUTHORITY,
+ GNUNET_NAMESTORE_RF_PRIVATE,
+ &put_gns_record,
+ NULL);
}
-//Prototype
-void
-resolve_name(struct GNUNET_GNS_PendingQuery *query, GNUNET_HashCode *zone);
+
+/* END DHT ZONE PROPAGATION */
/**
- * This is a callback function that should give us only PKEY
- * records. Used to query the namestore for the authority (PKEY)
- * for 'name'
- *
- * @param cls the pending query
- * @param zone our zone hash
- * @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
+ * Send shorten response back to client
+ *
+ * @param cls the closure containing a client shorten handle
+ * @param name the shortened name result or NULL if cannot be shortened
*/
-void
-process_authority_lookup(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)
+static void
+send_shorten_response(void* cls, const char* name)
{
- struct GNUNET_GNS_PendingQuery *query;
- GNUNET_HashCode zone;
-
- query = (struct GNUNET_GNS_PendingQuery *)cls;
- GNUNET_CRYPTO_hash(key, GNUNET_CRYPTO_RSA_KEY_LENGTH, &zone);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message with %s\n",
+ "SHORTEN_RESULT", name);
+ struct GNUNET_GNS_ClientShortenResultMessage *rmsg;
+ struct ClientShortenHandle *csh = (struct ClientShortenHandle *)cls;
- /**
- * No authority found in namestore.
- */
- if (rd_count == 0)
+ if (name == NULL)
{
- /**
- * We did not find an authority in the namestore
- * _IF_ the current authoritative zone is us we cannot resolve
- * _ELSE_ we can still check the dht
- */
- if (GNUNET_CRYPTO_hash_cmp(&zone, &zone_hash))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Authority unknown\n");
- //FIXME return NX answer
- return;
- }
-
- /**
- * Last hope
- */
- resolve_authority_dht(query, name);
- return;
+ name = "";
}
- //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
- */
+ rmsg = GNUNET_malloc(sizeof(struct GNUNET_GNS_ClientShortenResultMessage)
+ + strlen(name) + 1);
- GNUNET_assert(rd->record_type == GNUNET_GNS_RECORD_PKEY);
- GNUNET_HashCode *pkey_hash = GNUNET_malloc(sizeof(GNUNET_HashCode));
- GNUNET_CRYPTO_hash(rd->data, GNUNET_CRYPTO_RSA_KEY_LENGTH, pkey_hash);
- GNUNET_free_non_null(query->authority);
- query->authority = pkey_hash;
- resolve_name(query, query->authority);
+ rmsg->id = csh->unique_id;
+ rmsg->header.type = htons(GNUNET_MESSAGE_TYPE_GNS_SHORTEN_RESULT);
+ rmsg->header.size =
+ htons(sizeof(struct GNUNET_GNS_ClientShortenResultMessage) +
+ strlen(name) + 1);
+
+ strcpy((char*)&rmsg[1], name);
+
+ GNUNET_SERVER_notification_context_unicast (nc, csh->client,
+ (const struct GNUNET_MessageHeader *) rmsg,
+ GNUNET_NO);
+ GNUNET_SERVER_receive_done (csh->client, GNUNET_OK);
-}
+ GNUNET_free(rmsg);
+ GNUNET_free_non_null(csh->name);
+ GNUNET_free(csh);
+}
/**
- * Reply to client with the result from our lookup.
+ * Handle a shorten message from the api
*
- * @param answer the pending query used in the lookup
+ * @param cls the closure
+ * @param client the client
+ * @param message the message
*/
-void
-reply_to_dns(struct GNUNET_GNS_PendingQuery *answer, uint32_t rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+static void handle_shorten(void *cls,
+ struct GNUNET_SERVER_Client * client,
+ const struct GNUNET_MessageHeader * message)
{
- struct GNUNET_DNSPARSER_Flags dnsflags;
- int i;
- size_t len;
- int ret;
- char *buf;
- struct GNUNET_DNSPARSER_Packet packet;
- struct GNUNET_DNSPARSER_Record answer_records[answer->num_records];
- packet.answers = answer_records;
-
- len = sizeof(struct GNUNET_DNSPARSER_Record*);
- for (i=0; i < rd_count; i++)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "SHORTEN");
+
+ size_t msg_size = 0;
+ struct ClientShortenHandle *csh;
+ char name[MAX_DNS_NAME_LENGTH];
+ char* nameptr = name;
+
+ if (ntohs (message->size) < sizeof (struct GNUNET_GNS_ClientShortenMessage))
{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Adding type %d to DNS response\n", rd[i].record_type);
- answer_records[i].name = answer->original_name; //FIXME yes?
- 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
- //GNUNET_free(i->record); DO this later!
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
}
- 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;
-
- 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;
-
- packet.id = answer->id;
+
+ GNUNET_SERVER_notification_context_add (nc, client);
+
+ struct GNUNET_GNS_ClientShortenMessage *sh_msg =
+ (struct GNUNET_GNS_ClientShortenMessage *) message;
- //FIXME this is silently discarded
- 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);
- if (ret == GNUNET_OK)
+ msg_size = ntohs(message->size);
+
+ if (msg_size > GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Answering DNS request\n");
- GNUNET_DNS_request_answer(answer->request_handle,
- len,
- buf);
- //GNUNET_free(answer);
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Answered DNS request\n");
- //FIXME return code, free datastructures
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
}
- else
+
+ csh = GNUNET_malloc(sizeof(struct ClientShortenHandle));
+ csh->client = client;
+ csh->unique_id = sh_msg->id;
+
+ GNUNET_STRINGS_utf8_tolower((char*)&sh_msg[1], &nameptr);
+
+ if (strlen (name) < strlen(GNUNET_GNS_TLD)) {
+ csh->name = NULL;
+ send_shorten_response(csh, name);
+ return;
+ }
+
+ if (!is_gnunet_tld(name) && !is_zkey_tld(name))
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Error building DNS response! (ret=%d)", ret);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%s is not our domain. Returning\n", name);
+ csh->name = NULL;
+ send_shorten_response(csh, name);
+ return;
}
+
+ /* Start shortening */
+ if (GNUNET_YES == auto_import_pkey)
+ gns_resolver_shorten_name(zone_hash, name, zone_key,
+ &send_shorten_response, csh);
+ else
+ gns_resolver_shorten_name(zone_hash, name, NULL,
+ &send_shorten_response, csh);
}
/**
- * Namestore calls this function if we have an entry for this name.
- * (or data=null to indicate the lookup has finished)
- *
- * @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
+ * Send get authority response back to client
+ *
+ * @param cls the closure containing a client get auth handle
+ * @param name the shortened name result or NULL if cannot be shortened
*/
static void
-process_authoritative_result(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)
+send_get_auth_response(void *cls, const char* name)
{
- struct GNUNET_GNS_PendingQuery *query;
- struct GNUNET_GNS_QueryRecordList *qrecord;
- struct GNUNET_NAMESTORE_RecordData *record;
- struct GNUNET_TIME_Relative remaining_time;
- GNUNET_HashCode zone;
-
- query = (struct GNUNET_GNS_PendingQuery *) cls;
- GNUNET_CRYPTO_hash(key, GNUNET_CRYPTO_RSA_KEY_LENGTH, &zone);
- remaining_time = GNUNET_TIME_absolute_get_remaining (expiration);
-
- //FIXME Handle results in rd
-
- if (rd_count == 0)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message with %s\n",
+ "GET_AUTH_RESULT", name);
+ struct GNUNET_GNS_ClientGetAuthResultMessage *rmsg;
+ struct ClientGetAuthHandle *cah = (struct ClientGetAuthHandle *)cls;
+
+ if (name == NULL)
{
- /**
- * FIXME
- * Lookup terminated and no results
- * -> DHT Phase unless data is recent
- */
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Namestore lookup terminated. without results\n");
-
- /**
- * 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))
- {
- remaining_time = GNUNET_TIME_absolute_get_remaining (expiration);
- if (remaining_time.rel_value == 0)
- {
- resolve_name_dht(query, name);
- return;
- }
- else
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Record is still recent. No DHT lookup\n");
- }
- }
+ name = "";
+ }
- /**
- * Our zone and no result? Cannot resolve TT
- * FIXME modify query to say NX
- */
- GNUNET_assert(query->answered == 0);
- reply_to_dns(query, 0, NULL); //answered should be 0
- return;
+ rmsg = GNUNET_malloc(sizeof(struct GNUNET_GNS_ClientGetAuthResultMessage)
+ + strlen(name) + 1);
+
+ rmsg->id = cah->unique_id;
+ rmsg->header.type = htons(GNUNET_MESSAGE_TYPE_GNS_GET_AUTH_RESULT);
+ rmsg->header.size =
+ htons(sizeof(struct GNUNET_GNS_ClientGetAuthResultMessage) +
+ strlen(name) + 1);
+
+ strcpy((char*)&rmsg[1], name);
+
+ GNUNET_SERVER_notification_context_unicast (nc, cah->client,
+ (const struct GNUNET_MessageHeader *) rmsg,
+ GNUNET_NO);
+ GNUNET_SERVER_receive_done (cah->client, GNUNET_OK);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Cleaning up handles...\n");
- }
- else
- {
- /**
- * Record found
- *
- * FIXME Check record expiration and dht expiration
- * consult dht if necessary
- */
- if (remaining_time.rel_value == 0)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "This dht entry is old. Refreshing.\n");
- resolve_name_dht(query, name);
- return;
- }
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Processing additional result %s from namestore\n", name);
- int i;
- for (i=0; i<rd_count;i++)
- {
- 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;
- }
- // A time will come when this has to be freed
- qrecord = GNUNET_malloc(sizeof(struct GNUNET_GNS_QueryRecordList));
- record = GNUNET_malloc(sizeof(struct GNUNET_NAMESTORE_RecordData));
- qrecord->record = record;
-
- //fixme into gns_util
- //parse_record(rd[i]->data, rd[i]->data_size, 0, record);
- GNUNET_CONTAINER_DLL_insert(query->records_head,
- query->records_tail,
- qrecord);
- query->num_records++;
-
- //TODO really?
- //we need to resolve to the original name in the end though...
- //keep in mind. This can also be done later probably
- //record->name = (char*)query->original_name;
- }
+ GNUNET_free(rmsg);
+ GNUNET_free_non_null(cah->name);
+ GNUNET_free(cah);
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Found answer to query!\n");
- query->answered = 1;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "done.\n");
- reply_to_dns(query, rd_count, rd);
- }
}
+
/**
- * Determine if this name is canonical.
- * i.e.
- * a.b.gnunet = not canonical
- * a = canonical
+ * Handle a get authority message from the api
*
- * @param name the name to test
- * @return 1 if canonical
+ * @param cls the closure
+ * @param client the client
+ * @param message the message
*/
-int
-is_canonical(char* name)
+static void handle_get_authority(void *cls,
+ struct GNUNET_SERVER_Client * client,
+ const struct GNUNET_MessageHeader * message)
{
- uint32_t len = strlen(name);
- int i;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "GET_AUTH");
- for (i=0; i<len; i++)
+ size_t msg_size = 0;
+ struct ClientGetAuthHandle *cah;
+ char name[MAX_DNS_NAME_LENGTH];
+ char* nameptr = name;
+
+
+ if (ntohs (message->size) < sizeof (struct GNUNET_GNS_ClientGetAuthMessage))
{
- if (*(name+i) == '.')
- return 0;
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
}
- return 1;
-}
-/**
- * Move one level up in the domain hierarchy and return the
- * passed top level domain.
- * FIXME this needs a better name
- *
- * @param name the domain
- * @return the tld
- */
-char* pop_tld(char* name)
-{
- uint32_t len;
+ GNUNET_SERVER_notification_context_add (nc, client);
- if (is_canonical(name))
- return NULL;
+ struct GNUNET_GNS_ClientGetAuthMessage *sh_msg =
+ (struct GNUNET_GNS_ClientGetAuthMessage *) message;
+
+ msg_size = ntohs(message->size);
- for (len = strlen(name); len > 0; len--)
+ if (msg_size > GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
- if (*(name+len) == '.')
- break;
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
}
+
+ GNUNET_STRINGS_utf8_tolower((char*)&sh_msg[1], &nameptr);
- if (len == 0)
- return NULL; //Error
-
- name[len] = '\0'; //terminate string
- return (name+len+1);
-}
+ cah = GNUNET_malloc(sizeof(struct ClientGetAuthHandle));
+ cah->client = client;
+ cah->unique_id = sh_msg->id;
+ if (strlen(name) < strlen(GNUNET_GNS_TLD))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%s is too short. Returning\n", name);
+ cah->name = NULL;
+ send_get_auth_response(cah, name);
+ return;
+ }
-/**
- * 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.
- *
- * @param query the pending lookup
- * @param zone the zone we are currently resolving in
- */
-void
-resolve_name(struct GNUNET_GNS_PendingQuery *query, GNUNET_HashCode *zone)
-{
- if (is_canonical(query->name))
+ if (strcmp(name+strlen(name)-strlen(GNUNET_GNS_TLD),
+ GNUNET_GNS_TLD) != 0)
{
- //We only need to check this zone's ns
- GNUNET_NAMESTORE_lookup_record(namestore_handle,
- zone,
- query->name,
- query->type,
- &process_authoritative_result,
- query);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%s is not our domain. Returning\n", name);
+ cah->name = NULL;
+ send_get_auth_response(cah, name);
+ return;
}
- else
+
+ if (strcmp(name, GNUNET_GNS_TLD) == 0)
{
- //We have to resolve the authoritative entity
- char *new_authority = pop_tld(query->name);
- GNUNET_NAMESTORE_lookup_record(namestore_handle,
- zone,
- new_authority,
- GNUNET_GNS_RECORD_PKEY,
- &process_authority_lookup,
- query);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%s is us. Returning\n", name);
+ cah->name = NULL;
+ send_get_auth_response(cah, name);
+ return;
}
+
+ cah->name = GNUNET_malloc(strlen(name)
+ - strlen(GNUNET_GNS_TLD) + 1);
+ memset(cah->name, 0,
+ strlen(name)-strlen(GNUNET_GNS_TLD) + 1);
+ memcpy(cah->name, name,
+ strlen(name)-strlen(GNUNET_GNS_TLD));
+
+ /* Start delegation resolution in our namestore */
+ gns_resolver_get_authority(zone_hash, name, &send_get_auth_response, cah);
}
+
/**
- * Entry point for name resolution
- * Lookup local namestore of our zone.
- *
- * Setup a new query and try to resolve
+ * Reply to client with the result from our lookup.
*
- * @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 cls the closure (our client lookup handle)
+ * @param rd_count the number of records
+ * @param rd the record data
*/
-void
-start_resolution(struct GNUNET_DNS_RequestHandle *rh,
- char* name, uint16_t id, uint16_t type)
+static void
+send_lookup_response(void* cls,
+ uint32_t rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd)
{
- struct GNUNET_GNS_PendingQuery *query;
+ struct ClientLookupHandle* clh = (struct ClientLookupHandle*)cls;
+ struct GNUNET_GNS_ClientLookupResultMessage *rmsg;
+ size_t len;
- //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
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message with %d results\n",
+ "LOOKUP_RESULT", rd_count);
- //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));
+ len = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
+ rmsg = GNUNET_malloc(len+sizeof(struct GNUNET_GNS_ClientLookupResultMessage));
+
+ rmsg->id = clh->unique_id;
+ rmsg->rd_count = htonl(rd_count);
+ rmsg->header.type = htons(GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT);
+ rmsg->header.size =
+ htons(len+sizeof(struct GNUNET_GNS_ClientLookupResultMessage));
- query->type = type;
- query->request_handle = rh;
+ GNUNET_NAMESTORE_records_serialize (rd_count, rd, len, (char*)&rmsg[1]);
+
+ GNUNET_SERVER_notification_context_unicast (nc, clh->client,
+ (const struct GNUNET_MessageHeader *) rmsg,
+ GNUNET_NO);
+ GNUNET_SERVER_receive_done (clh->client, GNUNET_OK);
+
+ GNUNET_free(rmsg);
+ GNUNET_free(clh->name);
+ GNUNET_free(clh);
- //Start resolution in our zone
- resolve_name(query, &zone_hash);
}
+
/**
- * The DNS request handler
- * Called for every incoming DNS request.
+ * Handle lookup requests from client
*
- * @param cls closure
- * @param rh request handle to user for reply
- * @param request_length number of bytes in request
- * @param request udp payload of the DNS request
+ * @param cls the closure
+ * @param client the client
+ * @param message the message
*/
-void
-handle_dns_request(void *cls,
- struct GNUNET_DNS_RequestHandle *rh,
- size_t request_length,
- const char *request)
+static void
+handle_lookup(void *cls,
+ struct GNUNET_SERVER_Client * client,
+ const struct GNUNET_MessageHeader * message)
{
- struct GNUNET_DNSPARSER_Packet *p;
- int i;
- char *tldoffset;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "LOOKUP");
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Hijacked a DNS request...processing\n");
- p = GNUNET_DNSPARSER_parse (request, request_length);
-
- if (NULL == p)
+ size_t msg_size = 0;
+ size_t namelen;
+ char name[MAX_DNS_NAME_LENGTH];
+ struct ClientLookupHandle *clh;
+ char* nameptr = name;
+
+ if (ntohs (message->size) < sizeof (struct GNUNET_GNS_ClientLookupMessage))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Received malformed DNS packet, leaving it untouched\n");
- GNUNET_DNS_request_forward (rh);
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
-
- /**
- * Check tld and decide if we or
- * legacy dns is responsible
- *
- * FIXME now in theory there could be more than 1 query in the request
- * but if this is case we get into trouble:
- * either we query the GNS or the DNS. We cannot do both!
- * So I suggest to either only allow a single query per request or
- * only allow GNS or DNS requests.
- * 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++)
- {
- tldoffset = p->queries[i].name + strlen(p->queries[i].name);
- 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);
- }
- }
-}
+ GNUNET_SERVER_notification_context_add (nc, client);
-/**
- * test function that stores some data in the namestore
- */
-void
-put_some_records(void)
-{
- 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 in_addr *alice = GNUNET_malloc(sizeof(struct in_addr));
- struct in_addr *bob = GNUNET_malloc(sizeof(struct in_addr));
- struct GNUNET_NAMESTORE_RecordData *rda;
- struct GNUNET_NAMESTORE_RecordData *rdb;
-
- rda = GNUNET_malloc(sizeof(struct GNUNET_NAMESTORE_RecordData));
- rdb = GNUNET_malloc(sizeof(struct GNUNET_NAMESTORE_RecordData));
-
- GNUNET_assert(1 == inet_pton (AF_INET, ipA, alice));
- GNUNET_assert(1 == inet_pton (AF_INET, ipB, bob));
-
- rda->data_size = sizeof(struct in_addr);
- rdb->data_size = sizeof(struct in_addr);
- rda->data = alice;
- rdb->data = bob;
- rda->record_type = GNUNET_GNS_RECORD_TYPE_A;
- rdb->record_type = GNUNET_GNS_RECORD_TYPE_A;
- rda->expiration = GNUNET_TIME_absolute_get_forever ();
- rdb->expiration = GNUNET_TIME_absolute_get_forever ();
+ struct GNUNET_GNS_ClientLookupMessage *sh_msg =
+ (struct GNUNET_GNS_ClientLookupMessage *) message;
- GNUNET_NAMESTORE_record_create (namestore_handle,
- zone_key,
- "alice",
- rda,
- NULL,
- NULL);
- GNUNET_NAMESTORE_record_create (namestore_handle,
- zone_key,
- "bob",
- rdb,
- NULL,
- NULL);
-}
-
-void
-update_zone_dht_next(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- GNUNET_NAMESTORE_zone_iterator_next(namestore_iter);
-}
-
-/**
- * Function used to put all records successively into the DHT.
- *
- * @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
- */
-void
-put_gns_record(void *cls,
- const 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)
-{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Putting records into the DHT\n");
- struct GNUNET_TIME_Relative timeout;
- GNUNET_HashCode name_hash;
- GNUNET_HashCode xor_hash;
+ msg_size = ntohs(message->size);
- if (NULL == name) //We're done
+ if (msg_size > GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
- GNUNET_NAMESTORE_zone_iteration_stop (namestore_iter);
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- /**
- * FIXME magic number 20 move to config file
- */
- 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_DHT_put (dht_handle, &xor_hash,
- 5, //replication level
- GNUNET_DHT_RO_NONE,
- GNUNET_BLOCK_TYPE_TEST, //FIXME todo block plugin
- rd->data_size,
- rd->data,
- expiration,
- timeout,
- NULL, //FIXME continuation needed? success check? yes ofc
- NULL); //cls for cont
- num_public_records++;
-
- /**
- * Reschedule periodic put
- */
- GNUNET_SCHEDULER_add_delayed (dht_update_interval,
- &update_zone_dht_next,
- NULL);
-
+ GNUNET_STRINGS_utf8_tolower((char*)&sh_msg[1], &nameptr);
+ namelen = strlen(name)+1;
+ clh = GNUNET_malloc(sizeof(struct ClientLookupHandle));
+ clh->client = client;
+ clh->name = GNUNET_malloc(namelen);
+ strcpy(clh->name, name);
+ clh->unique_id = sh_msg->id;
+ clh->type = ntohl(sh_msg->type);
+
+ if (GNUNET_YES == auto_import_pkey)
+ {
+ gns_resolver_lookup_record(zone_hash, clh->type, name,
+ zone_key,
+ default_lookup_timeout,
+ &send_lookup_response, clh);
+ }
+ else
+ {
+ gns_resolver_lookup_record(zone_hash, clh->type, name,
+ NULL,
+ default_lookup_timeout,
+ &send_lookup_response, clh);
+ }
}
-/**
- * Periodically iterate over our zone and store everything in dht
- *
- * @param cls NULL
- * @param tc task context
- */
-static void
-update_zone_dht_start(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Update zone!\n");
- 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);
-}
+
/**
* Process GNS requests.
*
- * @param cls closure
+ * @param cls closure)
* @param server the initialized server
* @param c configuration to use
*/
const struct GNUNET_CONFIGURATION_Handle *c)
{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Init GNS\n");
- zone_key = GNUNET_CRYPTO_rsa_key_create ();
-
- GNUNET_CRYPTO_hash(zone_key, GNUNET_CRYPTO_RSA_KEY_LENGTH,//FIXME is this ok?
- &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)
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Initializing GNS\n");
+
+ char* keyfile;
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
+ unsigned long long max_parallel_bg_queries = 0;
+ unsigned long long default_lookup_timeout_secs = 0;
+ int ignore_pending = GNUNET_NO;
+
+ static const struct GNUNET_SERVER_MessageHandler handlers[] = {
+ {&handle_shorten, NULL, GNUNET_MESSAGE_TYPE_GNS_SHORTEN, 0},
+ {&handle_lookup, NULL, GNUNET_MESSAGE_TYPE_GNS_LOOKUP, 0},
+ {&handle_get_authority, NULL, GNUNET_MESSAGE_TYPE_GNS_GET_AUTH, 0}
+ };
+
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (c, "gns",
+ "ZONEKEY", &keyfile))
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Failed to connect to the dnsservice!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "No private key for root zone specified!\n");
+ GNUNET_SCHEDULER_shutdown(0);
+ return;
}
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Using keyfile %s for root zone.\n", keyfile);
+
+ zone_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+ GNUNET_CRYPTO_rsa_key_get_public (zone_key, &pkey);
+
+ GNUNET_CRYPTO_short_hash(&pkey,
+ sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ &zone_hash);
+ GNUNET_free(keyfile);
+
/**
* 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;
+ }
+
+
+
+ auto_import_pkey = GNUNET_NO;
+
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (c, "gns",
+ "AUTO_IMPORT_PKEY"))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Automatic PKEY import is enabled.\n");
+ auto_import_pkey = GNUNET_YES;
+
+ }
+
+ dht_max_update_interval = GNUNET_GNS_DHT_MAX_UPDATE_INTERVAL;
+
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number (c, "gns",
+ "DHT_MAX_UPDATE_INTERVAL",
+ &dht_max_update_interval))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "DHT zone update interval: %d\n",
+ dht_max_update_interval);
+ }
+
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number (c, "gns",
+ "MAX_PARALLEL_BACKGROUND_QUERIES",
+ &max_parallel_bg_queries))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Number of allowed parallel background queries: %d\n",
+ max_parallel_bg_queries);
+ }
+
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (c, "gns",
+ "AUTO_IMPORT_CONFIRMATION_REQ"))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Auto import requires user confirmation\n");
+ ignore_pending = GNUNET_YES;
}
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number(c, "gns",
+ "DEFAULT_LOOKUP_TIMEOUT",
+ &default_lookup_timeout_secs))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Default lookup timeout: %ds\n", default_lookup_timeout_secs);
+ default_lookup_timeout = GNUNET_TIME_relative_multiply(
+ GNUNET_TIME_UNIT_SECONDS,
+ default_lookup_timeout_secs);
+ }
+
/**
* handle to the dht
*/
- dht_handle = GNUNET_DHT_connect(c, 1); //FIXME get ht_len from cfg
+ dht_handle = GNUNET_DHT_connect(c,
+ //max_parallel_bg_queries); //FIXME get ht_len from cfg
+ 1024);
if (NULL == dht_handle)
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Could not connect to DHT!\n");
}
+
+ if (gns_resolver_init(namestore_handle, dht_handle, zone_hash,
+ max_parallel_bg_queries,
+ ignore_pending)
+ == GNUNET_SYSERR)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ "Unable to initialize resolver!\n");
+ GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ return;
+ }
+
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (c, "gns", "HIJACK_DNS"))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "DNS hijacking enabled... connecting to service.\n");
- put_some_records(); //FIXME for testing
+ if (gns_interceptor_init(zone_hash, zone_key, c) == GNUNET_SYSERR)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ "Failed to enable the dns interceptor!\n");
+ }
+ }
/**
* Schedule periodic put
* 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_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);
+ GNUNET_SERVER_add_handlers (server, handlers);
+
+ //FIXME
+ //GNUNET_SERVER_disconnect_notify (server,
+ // &client_disconnect_notification,
+ // NULL);
+
+ nc = GNUNET_SERVER_notification_context_create (server, 1);
+
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
+ NULL);
}
projects / oweals / gnunet.git / blobdiff