/*
This file is part of GNUnet.
- (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
+ (C) 2009, 2010, 2011, 2012 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
-
/**
- *
- * TODO:
- * - Write xquery and block plugin
- * - The smaller FIXME issues all around
- *
* @file gns/gnunet-service-gns.c
* @brief GNUnet GNS service
* @author Martin Schanzenbach
#include "gnunet_dht_service.h"
#include "gnunet_namestore_service.h"
#include "gnunet_gns_service.h"
+#include "gnunet_statistics_service.h"
#include "block_gns.h"
#include "gns.h"
+#include "gns_common.h"
+#include "gnunet-service-gns_resolver.h"
+#include "gnunet-service-gns_interceptor.h"
+#include "gnunet_protocols.h"
+
+/**
+ * The initial interval in milliseconds btween puts in
+ * a zone iteration
+ */
+#define INITIAL_PUT_INTERVAL GNUNET_TIME_UNIT_MILLISECONDS
+
+/**
+ * The upper bound for the zone iteration interval in milliseconds
+ */
+#define MINIMUM_ZONE_ITERATION_INTERVAL GNUNET_TIME_UNIT_SECONDS
-#define DHT_OPERATION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3)
-#define DHT_LOOKUP_TIMEOUT DHT_OPERATION_TIMEOUT
-#define DHT_GNS_REPLICATION_LEVEL 5
-#define MAX_DNS_LABEL_LENGTH 63
+/**
+ * The default put interval for the zone iteration. In case
+ * No option is found
+ */
+#define DEFAULT_ZONE_PUBLISH_TIME_WINDOW GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 4)
-/* Ignore for now not used anyway and probably never will */
-#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
+/**
+ * The factor the current zone iteration interval is divided by for each
+ * additional new record
+ */
+#define LATE_ITERATION_SPEEDUP_FACTOR 2
-struct AuthorityChain
+/**
+ * Handle to a shorten operation from api
+ */
+struct ClientShortenHandle
{
- struct AuthorityChain *prev;
- struct AuthorityChain *next;
+ /**
+ * List for all shorten requests
+ */
+ struct ClientShortenHandle *next;
- GNUNET_HashCode zone;
+ /**
+ * List for all shorten requests
+ */
+ struct ClientShortenHandle *prev;
- /* (local) name of the authority */
- char* name;
+ /**
+ * Handle to the requesting client
+ */
+ struct GNUNET_SERVER_Client *client;
- /* was the ns entry fresh */
- int fresh;
-};
+ /**
+ * Namestore lookup task
+ */
+ struct GNUNET_NAMESTORE_QueueEntry *namestore_task;
+
+ /**
+ * master zone
+ */
+ struct GNUNET_CRYPTO_ShortHashCode root_zone;
+
+ /**
+ * private zone
+ */
+ struct GNUNET_CRYPTO_ShortHashCode private_zone;
+
+ /**
+ * shorten zone
+ */
+ struct GNUNET_CRYPTO_ShortHashCode shorten_zone;
+
+ /**
+ * The request id
+ */
+ uint32_t request_id;
+
+ /**
+ * request type
+ */
+ enum GNUNET_GNS_RecordType type;
-struct GNUNET_GNS_ResolverHandle;
+ /**
+ * name to shorten
+ */
+ char name[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
-typedef void (*ResolutionResultProcessor) (void *cls,
- struct GNUNET_GNS_ResolverHandle *rh,
- uint32_t rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd);
+ /**
+ * name of private zone (relative to root)
+ */
+ char private_zone_id[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
+
+ /**
+ * name of shorten zone (relative to root)
+ */
+ char shorten_zone_id[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
-enum ResolutionStatus
-{
- EXISTS = 1,
- EXPIRED = 2
};
+
/**
- * Handle to a currenty pending resolution
+ * Handle to a get authority operation from api
*/
-struct GNUNET_GNS_ResolverHandle
+struct ClientGetAuthHandle
{
- /* The name to resolve */
+ /**
+ * Handle to the requesting client
+ */
+ struct GNUNET_SERVER_Client *client;
+
+ /**
+ * name to lookup authority
+ */
char *name;
- /* 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 */
+ /**
+ * request id
+ */
+ uint32_t request_id;
- struct GNUNET_DNSPARSER_Query *query;
-
- /* has this query been answered? how many matches */
- int answered;
+};
- /* the authoritative zone to query */
- GNUNET_HashCode authority;
- /* the name of the authoritative zone to query */
- char *authority_name;
+/**
+ * Handle to a lookup operation from api
+ */
+struct ClientLookupHandle
+{
/**
- * we have an authority in namestore that
- * may be able to resolve
+ * Handle to the requesting client
*/
- 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_SERVER_Client *client;
- ResolutionResultProcessor proc;
+ /**
+ * optional zone private key used for shorten
+ */
+ struct GNUNET_CRYPTO_EccPrivateKey *shorten_key;
- void* proc_cls;
+ /**
+ * the name to look up
+ */
+ char *name;
- struct AuthorityChain *authority_chain_head;
- struct AuthorityChain *authority_chain_tail;
+ /**
+ * The zone we look up in
+ */
+ struct GNUNET_CRYPTO_ShortHashCode zone;
- enum ResolutionStatus status;
+ /**
+ * request id
+ */
+ uint32_t request_id;
-};
+ /**
+ * GNUNET_YES if we only want to lookup from local cache
+ */
+ int only_cached;
-struct ClientShortenHandle
-{
- struct GNUNET_SERVER_Client *client;
- uint64_t unique_id;
- GNUNET_HashCode key;
- char* name;
- uint32_t offset;
+ /**
+ * request type
+ */
+ enum GNUNET_GNS_RecordType type;
};
-/**
- * Our handle to the DNS handler library
- */
-struct GNUNET_DNS_Handle *dns_handle;
/**
* Our handle to the DHT
*/
-struct GNUNET_DHT_Handle *dht_handle;
+static struct GNUNET_DHT_Handle *dht_handle;
/**
* Our zone's private key
*/
-struct GNUNET_CRYPTO_RsaPrivateKey *zone_key;
+static struct GNUNET_CRYPTO_EccPrivateKey *zone_key;
/**
* Our handle to the namestore service
- * FIXME maybe need a second handle for iteration
*/
-struct GNUNET_NAMESTORE_Handle *namestore_handle;
+static 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
- */
-const struct GNUNET_CONFIGURATION_Handle *GNS_cfg;
+static struct GNUNET_NAMESTORE_ZoneIterator *namestore_iter;
/**
* Our notification context.
/**
* Our zone hash
*/
-GNUNET_HashCode zone_hash;
+static 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 unsigned long long num_public_records;
/**
- * Useful for zone update for DHT put
+ * Last seen record count
*/
-static int num_public_records = 3600;
-struct GNUNET_TIME_Relative dht_update_interval;
-GNUNET_SCHEDULER_TaskIdentifier zone_update_taskid = GNUNET_SCHEDULER_NO_TASK;
+static unsigned long long last_num_public_records;
-//static void resolve_name(struct GNUNET_GNS_ResolverHandle *rh);
+/**
+ * Zone iteration PUT interval.
+ */
+static struct GNUNET_TIME_Relative put_interval;
/**
- * Reply to client with the result from our lookup.
- *
- * @param rh the request handle of the lookup
- * @param rd_count the number of records to return
- * @param rd the record data
+ * Time window for zone iteration
*/
-static void
-reply_to_dns(void* cls, struct GNUNET_GNS_ResolverHandle *rh, uint32_t rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
-{
- 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;
-
- /**
- * Put records in the DNS packet and modify it
- * to a response
- */
- len = sizeof(struct GNUNET_DNSPARSER_Record*);
- for (i=0; i < rd_count; i++)
- {
-
- GNUNET_log(GNUNET_ERROR_TYPE_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
- }
- }
-
- 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;
+static struct GNUNET_TIME_Relative zone_publish_time_window;
- 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;
+/**
+ * zone publish task
+ */
+static GNUNET_SCHEDULER_TaskIdentifier zone_publish_task;
-
- /**
- * 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_DEBUG,
- "Built DNS response! (ret=%d,len=%d)\n", ret, len);
- if (ret == GNUNET_OK)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Answering DNS request\n");
- GNUNET_DNS_request_answer(rh->request_handle,
- len,
- buf);
- //GNUNET_free(answer);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Answered DNS request\n");
- }
- else
- {
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Error building DNS response! (ret=%d)", ret);
- }
+/**
+ * GNUNET_YES if automatic pkey import for name shortening
+ * is enabled
+ */
+static int auto_import_pkey;
- GNUNET_free(rh->name);
- GNUNET_free(rh);
-}
+/**
+ * GNUNET_YES if zone has never been published before
+ */
+static int first_zone_iteration;
+
+/**
+ * The lookup timeout
+ */
+static struct GNUNET_TIME_Relative default_lookup_timeout;
+
+/**
+ * GNUNET_YES if ipv6 is supported
+ */
+static int v6_enabled;
+
+/**
+ * GNUNET_YES if ipv4 is supported
+ */
+static int v4_enabled;
+
+/**
+ * List for shorten requests
+ */
+static struct ClientShortenHandle *csh_head;
+
+/**
+ * List for shorten requests
+ */
+static struct ClientShortenHandle *csh_tail;
+
+/**
+ * Handle to the statistics service
+ */
+static struct GNUNET_STATISTICS_Handle *statistics;
/**
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, 1);
- GNUNET_DHT_disconnect(dht_handle);
-}
+ struct ClientShortenHandle *csh_tmp;
-/**
- * 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,
+ "Shutting down!\n");
+ while (NULL != (csh_tmp = csh_head))
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "records already in namestore\n");
- return;
+ GNUNET_CONTAINER_DLL_remove (csh_head, csh_tail, csh_tmp);
+ GNUNET_free (csh_tmp);
}
- else if (GNUNET_YES == success)
+ GNUNET_SERVER_notification_context_destroy (nc);
+ gns_interceptor_stop ();
+ gns_resolver_cleanup ();
+ if (NULL != statistics)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "records successfully put in namestore\n");
- return;
+ GNUNET_STATISTICS_destroy (statistics, GNUNET_NO);
+ statistics = NULL;
+ }
+ if (GNUNET_SCHEDULER_NO_TASK != zone_publish_task)
+ {
+ GNUNET_SCHEDULER_cancel (zone_publish_task);
+ zone_publish_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (NULL != namestore_iter)
+ {
+ GNUNET_NAMESTORE_zone_iteration_stop (namestore_iter);
+ namestore_iter = NULL;
+ }
+ if (NULL != namestore_handle)
+ {
+ GNUNET_NAMESTORE_disconnect (namestore_handle);
+ namestore_handle = NULL;
+ }
+ if (NULL != dht_handle)
+ {
+ GNUNET_DHT_disconnect (dht_handle);
+ dht_handle = NULL;
}
-
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Error putting records into namestore: %s\n", emsg);
}
+
/**
- * Handle timeout for DHT requests
+ * Method called periodically that triggers iteration over authoritative records
*
- * @param cls the request handle as closure
- * @param tc the task context
+ * @param cls closure
+ * @param tc task context
*/
static void
-dht_lookup_timeout(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+publish_zone_dht_next (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);
- rh->proc(rh->proc_cls, rh, 0, NULL);
+ zone_publish_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_NAMESTORE_zone_iterator_next (namestore_iter);
}
+/**
+ * Periodically iterate over our zone and store everything in dht
+ *
+ * @param cls NULL
+ * @param tc task context
+ */
+static void
+publish_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 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
+ * @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
*/
static void
-process_record_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)
-{
- struct GNUNET_GNS_ResolverHandle *rh;
+put_gns_record (void *cls,
+ const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *key,
+ struct GNUNET_TIME_Absolute expiration,
+ const char *name,
+ unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd,
+ const struct GNUNET_CRYPTO_EccSignature *signature)
+{
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;
+ struct GNUNET_CRYPTO_ShortHashCode zhash;
+ struct GNUNET_HashCode dht_key;
+ uint32_t rd_payload_length;
+ char* nrb_data = NULL;
+ size_t namelen;
+ struct GNUNET_TIME_Relative next_put_interval;
- //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);
+ if (NULL == name)
{
- 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))
+ /* we're done */
+ namestore_iter = NULL;
+ last_num_public_records = num_public_records;
+ first_zone_iteration = GNUNET_NO;
+ if (0 == num_public_records)
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Error deserializing data!\n");
- return;
+ /**
+ * If no records are known (startup) or none present
+ * we can safely set the interval to the value for a single
+ * record
+ */
+ put_interval = zone_publish_time_window;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
+ "No records in db.\n");
}
-
- for (i=0; i<num_records; i++)
+ else
{
- 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++;
- }
-
+ put_interval = GNUNET_TIME_relative_divide (zone_publish_time_window,
+ num_public_records);
}
+ put_interval = GNUNET_TIME_relative_max (MINIMUM_ZONE_ITERATION_INTERVAL,
+ put_interval);
- GNUNET_CRYPTO_hash(name, strlen(name), &name_hash);
- GNUNET_CRYPTO_hash_xor(key, &name_hash, &zone);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Zone iteration finished. Adjusted zone iteration interval to %s\n",
+ GNUNET_STRINGS_relative_time_to_string (put_interval, GNUNET_YES));
+ GNUNET_STATISTICS_set (statistics,
+ "Current zone iteration interval (in ms)",
+ put_interval.rel_value,
+ GNUNET_NO);
+ GNUNET_STATISTICS_update (statistics,
+ "Number of zone iterations", 1, GNUNET_NO);
+ GNUNET_STATISTICS_set (statistics,
+ "Number of public records in DHT",
+ last_num_public_records,
+ GNUNET_NO);
+ if (0 == num_public_records)
+ zone_publish_task = GNUNET_SCHEDULER_add_delayed (put_interval,
+ &publish_zone_dht_start,
+ NULL);
+ else
+ zone_publish_task = GNUNET_SCHEDULER_add_now (&publish_zone_dht_start, NULL);
+ return;
+ }
- /**
- * 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
+ namelen = strlen (name) + 1;
+ if (0 == rd_count)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "No records for name `%s'! Skipping.\n",
+ name);
+ zone_publish_task = GNUNET_SCHEDULER_add_now (&publish_zone_dht_next,
+ NULL);
+ return;
+ }
+ if (NULL == signature)
+ {
+ GNUNET_break (0);
+ zone_publish_task = GNUNET_SCHEDULER_add_now (&publish_zone_dht_next,
+ NULL);
+ return;
+ }
- if (rh->answered)
- rh->proc(rh->proc_cls, rh, num_records, rd);
- else
- rh->proc(rh->proc_cls, rh, 0, NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Putting records for `%s' into the DHT\n", name);
+ rd_payload_length = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
+ nrb = GNUNET_malloc (rd_payload_length + namelen
+ + sizeof (struct GNSNameRecordBlock));
+ 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;
+ rd_payload_length += sizeof(struct GNSNameRecordBlock) + namelen;
+ GNUNET_CRYPTO_short_hash (key,
+ sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
+ &zhash);
+ if (-1 == GNUNET_NAMESTORE_records_serialize (rd_count,
+ rd,
+ rd_payload_length,
+ nrb_data))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Records for name `%s' in zone %s too large to fit into DHT"),
+ name,
+ GNUNET_short_h2s (&zhash));
+ GNUNET_free (nrb);
+ zone_publish_task = GNUNET_SCHEDULER_add_now (&publish_zone_dht_next,
+ NULL);
+ return;
}
+ GNUNET_GNS_get_key_for_record (name, &zhash, &dht_key);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "putting %u records from zone %s for `%s' under key: %s with size %u and timeout %s\n",
+ rd_count,
+ GNUNET_short_h2s (&zhash),
+ name,
+ GNUNET_h2s (&dht_key),
+ (unsigned int) rd_payload_length,
+ GNUNET_STRINGS_relative_time_to_string (DHT_OPERATION_TIMEOUT, GNUNET_YES));
+
+ GNUNET_STATISTICS_update (statistics,
+ "Record bytes put into DHT",
+ rd_payload_length, GNUNET_NO);
+
+ (void) GNUNET_DHT_put (dht_handle, &dht_key,
+ DHT_GNS_REPLICATION_LEVEL,
+ GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
+ GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
+ rd_payload_length,
+ (char*)nrb,
+ expiration,
+ DHT_OPERATION_TIMEOUT,
+ NULL,
+ NULL);
+ GNUNET_free (nrb);
+
+ num_public_records++;
+ if ( (num_public_records > last_num_public_records)
+ && (GNUNET_NO == first_zone_iteration) )
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Last record count was lower than current record count. Reducing interval.\n");
+ put_interval = GNUNET_TIME_relative_divide (zone_publish_time_window,
+ num_public_records);
+ next_put_interval = GNUNET_TIME_relative_divide (put_interval,
+ LATE_ITERATION_SPEEDUP_FACTOR);
+ }
+ else
+ next_put_interval = put_interval;
+
+ GNUNET_STATISTICS_set (statistics,
+ "Current zone iteration interval (ms)",
+ next_put_interval.rel_value,
+ GNUNET_NO);
+ zone_publish_task = GNUNET_SCHEDULER_add_delayed (next_put_interval,
+ &publish_zone_dht_next,
+ NULL);
}
/**
- * Start DHT lookup for a (name -> query->record_type) record in
- * rh->authority's zone
+ * Periodically iterate over our zone and store everything in dht
*
- * @param rh the pending gns query context
- * @param name the name to query record
+ * @param cls NULL
+ * @param tc task context
*/
static void
-resolve_record_from_dht(struct GNUNET_GNS_ResolverHandle *rh)
+publish_zone_dht_start (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- uint32_t xquery;
- GNUNET_HashCode name_hash;
- GNUNET_HashCode lookup_key;
- struct GNUNET_CRYPTO_HashAsciiEncoded lookup_key_string;
-
- GNUNET_CRYPTO_hash(rh->name, strlen(rh->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",
- rh->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);
- rh->get_handle = GNUNET_DHT_get_start(dht_handle,
- DHT_OPERATION_TIMEOUT,
- GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
- &lookup_key,
- DHT_GNS_REPLICATION_LEVEL,
- GNUNET_DHT_RO_NONE,
- &xquery,
- sizeof(xquery),
- &process_record_dht_result,
- rh);
+ zone_publish_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Scheduling DHT zone update!\n");
+ /* start counting again */
+ num_public_records = 0;
+ namestore_iter = GNUNET_NAMESTORE_zone_iteration_start (namestore_handle,
+ NULL, /* All zones */
+ GNUNET_NAMESTORE_RF_AUTHORITY,
+ GNUNET_NAMESTORE_RF_PRIVATE,
+ &put_gns_record,
+ NULL);
}
+/* END DHT ZONE PROPAGATION */
+
+
/**
- * Namestore calls this function if we have record for this name.
- * (or with rd_count=0 to indicate no matches)
- *
- * @param cls the pending query
- * @param key the key of the zone we did the lookup
- * @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
+ * 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
*/
static void
-process_record_lookup_ns(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_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);
-
- rh->status = 0;
-
- if (name != NULL)
- {
- rh->status |= EXISTS;
- }
-
- if (remaining_time.rel_value == 0)
- {
- rh->status |= EXPIRED;
- }
-
- if (rd_count == 0)
- {
- /**
- * Lookup terminated and no results
- */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Namestore lookup for %s terminated without results\n", name);
-
-
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Record %s unknown in namestore\n",
- rh->name);
- /**
- * Our zone and no result? Cannot resolve TT
- */
- rh->proc(rh->proc_cls, rh, 0, NULL);
- return;
-
- }
- else
- {
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Processing additional result %s from namestore\n", name);
- int i;
- for (i=0; i<rd_count;i++)
- {
-
- if (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++;
-
- }
-
- /**
- * no answers found
- */
- if (rh->answered == 0)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "No answers found. This is odd!\n");
- rh->proc(rh->proc_cls, rh, 0, NULL);
- return;
- }
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Found %d answer(s) to query!\n",
- rh->answered);
-
- rh->proc(rh->proc_cls, rh, rd_count, rd);
- }
-}
-
-/**
- * The final phase of resolution.
- * This is a name that is canonical and we do not have a delegation.
- *
- * @param rh the pending lookup
- */
-static void
-resolve_record_from_ns(struct GNUNET_GNS_ResolverHandle *rh)
-{
-
- /**
- * Try to resolve this record in our namestore.
- * The name to resolve is now in rh->authority_name
- * since we tried to resolve it to an authority
- * and failed.
- **/
- GNUNET_NAMESTORE_lookup_record(namestore_handle,
- &rh->authority,
- rh->name,
- rh->query->type,
- &process_record_lookup_ns,
- rh);
-
-}
-
-
-/**
- * Handle timeout for DHT requests
- *
- * @param cls the request handle as closure
- * @param tc the task context
- */
-static void
-dht_authority_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);
- if (strcmp(rh->name, "") == 0)
- {
- /*
- * promote authority back to name and try to resolve record
- */
- strcpy(rh->name, rh->authority_name);
- }
- rh->proc(rh->proc_cls, rh, 0, NULL);
-}
-
-// Prototype
-static void resolve_delegation_from_dht(struct GNUNET_GNS_ResolverHandle *rh);
-
-/**
- * Function called when we get a result from the dht
- * for our query. Recursively tries to resolve PKEYs
- * for name in DHT.
- *
- * @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,
- 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)
-{
- 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);
-
- 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;
- memcpy(&rh->authority, rd[i].data, sizeof(GNUNET_HashCode));
- struct AuthorityChain *auth =
- GNUNET_malloc(sizeof(struct AuthorityChain));
- auth->zone = rh->authority;
- auth->name = GNUNET_malloc(strlen(rh->authority_name)+1);
- memset(auth->name, 0, strlen(rh->authority_name)+1);
- strcpy(auth->name, rh->authority_name);
- GNUNET_CONTAINER_DLL_insert (rh->authority_chain_head,
- rh->authority_chain_tail,
- auth);
- }
-
- }
-
-
- 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;
- /* delegate */
- if (strcmp(rh->name, "") == 0)
- rh->proc(rh->proc_cls, rh, 0, NULL);
- else
- resolve_delegation_from_dht(rh);
- return;
- }
-
- /**
- * should never get here unless false dht key/put
- * block plugin should handle this
- **/
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "DHT authority lookup error!\n");
- GNUNET_break(0);
-}
-
-
-/**
- * Process DHT lookup result for record.
- *
- * @param cls the closure
- * @param rh resolver handle
- * @param rd_count number of results (always 0)
- * @param rd record data (always NULL)
- */
-static void
-process_record_result_dht(void* cls, struct GNUNET_GNS_ResolverHandle *rh,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
-{
- if (rd_count == 0)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "No records for %s found in DHT. Aborting\n",
- rh->name);
- /* give up, cannot resolve */
- reply_to_dns(NULL, rh, 0, NULL);
- return;
- }
-
- /* results found yay */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Record resolved from namestore!");
- reply_to_dns(NULL, rh, rd_count, rd);
-
-}
-
-
-/**
- * Process namestore lookup result for record.
- *
- * @param cls the closure
- * @param rh resolver handle
- * @param rd_count number of results (always 0)
- * @param rd record data (always NULL)
- */
-static void
-process_record_result_ns(void* cls, struct GNUNET_GNS_ResolverHandle *rh,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
-{
- if (rd_count == 0)
- {
- /* ns entry expired. try dht */
- if (rh->status & (EXPIRED | !EXISTS))
- {
- rh->proc = &process_record_result_dht;
- resolve_record_from_dht(rh);
- return;
- }
- /* give up, cannot resolve */
- reply_to_dns(NULL, rh, 0, NULL);
- return;
- }
-
- /* results found yay */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Record resolved from namestore!");
- reply_to_dns(NULL, rh, rd_count, rd);
-
-}
-
-
-/**
- * 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);
- int i;
-
- for (i=0; i<len; i++)
- {
- if (*(name+i) == '.')
- return 0;
- }
- return 1;
-}
-
-/**
- * Move one level up in the domain hierarchy and return the
- * passed top level domain.
- *
- * @param name the domain
- * @param dest the destination where the tld will be put
- */
-void
-pop_tld(char* name, char* dest)
-{
- uint32_t len;
-
- if (is_canonical(name))
- {
- strcpy(dest, name);
- strcpy(name, "");
- return;
- }
-
- for (len = strlen(name); len > 0; len--)
- {
- if (*(name+len) == '.')
- break;
- }
-
- //Was canonical?
- if (len == 0)
- return;
-
- name[len] = '\0';
-
- strcpy(dest, (name+len+1));
-}
-
-/**
- * DHT resolution for delegation finished. Processing result.
- *
- * @param cls the closure
- * @param rh resolver handle
- * @param rd_count number of results (always 0)
- * @param rd record data (always NULL)
- */
-static void
-process_dht_delegation_dns(void* cls, struct GNUNET_GNS_ResolverHandle *rh,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
-{
- if (strcmp(rh->name, "") == 0)
- {
- /* We resolved full name for delegation. resolving record */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Resolved full name for delegation via DHT. resolving record '' in ns\n");
- rh->proc = &process_record_result_ns;
- resolve_record_from_ns(rh);
- return;
- }
-
- /**
- * we still have some left
- **/
- if (is_canonical(rh->name))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Resolving canonical record %s in ns\n", rh->name);
- rh->proc = &process_record_result_ns;
- resolve_record_from_ns(rh);
- return;
- }
- /* give up, cannot resolve */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Cannot fully resolve delegation for %s via DHT!\n",
- rh->name);
- reply_to_dns(NULL, rh, 0, NULL);
-}
-
-
-/**
- * Start DHT lookup for a name -> PKEY (compare NS) record in
- * rh->authority's zone
- *
- * @param rh the pending gns query
- * @param name the name of the PKEY record
- */
-static void
-resolve_delegation_from_dht(struct GNUNET_GNS_ResolverHandle *rh)
-{
- uint32_t xquery;
- GNUNET_HashCode name_hash;
- GNUNET_HashCode lookup_key;
-
- GNUNET_CRYPTO_hash(rh->authority_name,
- strlen(rh->authority_name),
- &name_hash);
- GNUNET_CRYPTO_hash_xor(&name_hash, &rh->authority, &lookup_key);
-
- rh->dht_timeout_task = GNUNET_SCHEDULER_add_delayed (DHT_LOOKUP_TIMEOUT,
- &dht_authority_lookup_timeout,
- rh);
-
- xquery = htonl(GNUNET_GNS_RECORD_PKEY);
-
- rh->get_handle = GNUNET_DHT_get_start(dht_handle,
- DHT_OPERATION_TIMEOUT,
- GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
- &lookup_key,
- DHT_GNS_REPLICATION_LEVEL,
- GNUNET_DHT_RO_NONE,
- &xquery,
- sizeof(xquery),
- &process_authority_dht_result,
- rh);
-
-}
-
-
-/**
- * Namestore resolution for delegation finished. Processing result.
- *
- * @param cls the closure
- * @param rh resolver handle
- * @param rd_count number of results (always 0)
- * @param rd record data (always NULL)
- */
-static void
-process_ns_delegation_dns(void* cls, struct GNUNET_GNS_ResolverHandle *rh,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
-{
- if (strcmp(rh->name, "") == 0)
- {
- /* We resolved full name for delegation. resolving record */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Resolved full name for delegation. resolving record ''\n");
- rh->proc = &process_record_result_ns;
- resolve_record_from_ns(rh);
- return;
- }
-
- /**
- * we still have some left
- * check if ns entry is fresh
- **/
- if (rh->status & (EXISTS | !EXPIRED))
- {
- if (is_canonical(rh->name))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Resolving canonical record %s\n", rh->name);
- rh->proc = &process_record_result_ns;
- resolve_record_from_ns(rh);
- }
- else
- {
- /* give up, cannot resolve */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Cannot fully resolve delegation for %s!\n",
- rh->name);
- reply_to_dns(NULL, rh, 0, NULL);
- }
- return;
- }
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Trying to resolve delegation for %s via DHT\n",
- rh->name);
- rh->proc = &process_dht_delegation_dns;
- resolve_delegation_from_dht(rh);
-}
-
-//Prototype
-static void resolve_delegation_from_ns(struct GNUNET_GNS_ResolverHandle *rh);
-
-/**
- * This is a callback function that should give us only PKEY
- * records. Used to query the namestore for the authority (PKEY)
- * for 'name'. It will recursively try to resolve the
- * authority for a given name from the namestore.
- *
- * @param cls the pending query
- * @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 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_authority_lookup_ns(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_ResolverHandle *rh;
- struct GNUNET_TIME_Relative remaining_time;
- GNUNET_HashCode zone;
- char* new_name;
-
- 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);
-
- rh->status = 0;
-
- if (name != NULL)
- {
- rh->status |= EXISTS;
- }
-
- if (remaining_time.rel_value == 0)
- {
- rh->status |= EXPIRED;
- }
-
- /**
- * No authority found in namestore.
- */
- if (rd_count == 0)
- {
- /**
- * We did not find an authority in the namestore
- */
-
- /**
- * No PKEY in zone.
- * Promote this authority back to a name maybe it is
- * our record.
- */
- if (strcmp(rh->name, "") == 0)
- {
- /* simply promote back */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Promoting %s back to name\n", rh->authority_name);
- strcpy(rh->name, rh->authority_name);
- }
- else
- {
- /* add back to existing name */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Adding %s back to %s\n",
- rh->authority_name, rh->name);
- new_name = GNUNET_malloc(strlen(rh->name)
- + strlen(rh->authority_name) + 2);
- memset(new_name, 0, strlen(rh->name) + strlen(rh->authority_name) + 2);
- strcpy(new_name, rh->name);
- strcpy(new_name+strlen(new_name)+1, ".");
- strcpy(new_name+strlen(new_name)+2, rh->authority_name);
- GNUNET_free(rh->name);
- rh->name = new_name;
- }
- rh->proc(rh->proc_cls, 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
- */
- 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.\n");
- rh->authority_chain_head->fresh = 0;
- rh->proc(rh->proc_cls, rh, 0, NULL);
- return;
- }
-
- continue;
- }
-
- /**
- * Resolve rest of query with new authority
- */
- GNUNET_assert(rd[i].record_type == GNUNET_GNS_RECORD_PKEY);
- memcpy(&rh->authority, rd[i].data, sizeof(GNUNET_HashCode));
- struct AuthorityChain *auth = GNUNET_malloc(sizeof(struct AuthorityChain));
- auth->zone = rh->authority;
- auth->name = GNUNET_malloc(strlen(rh->authority_name)+1);
- memset(auth->name, 0, strlen(rh->authority_name)+1);
- strcpy(auth->name, rh->authority_name);
- GNUNET_CONTAINER_DLL_insert (rh->authority_chain_head,
- rh->authority_chain_tail,
- auth);
-
- /**
- * We are done with PKEY resolution if name is empty
- * else resolve again with new authority
- */
- if (strcmp(rh->name, "") == 0)
- rh->proc(rh->proc_cls, rh, 0, NULL);
- else
- resolve_delegation_from_ns(rh);
- return;
- }
-
- /**
- * no answers found
- */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Authority lookup successful but no PKEY... never get here\n");
- rh->proc(rh->proc_cls, rh, 0, NULL);
-}
-
-
-/**
- * Resolve the delegation chain for the request
- *
- * @param rh the resolver handle
- */
-static void
-resolve_delegation_from_ns(struct GNUNET_GNS_ResolverHandle *rh)
-{
-
- pop_tld(rh->name, rh->authority_name);
- GNUNET_NAMESTORE_lookup_record(namestore_handle,
- &rh->authority,
- rh->authority_name,
- GNUNET_GNS_RECORD_PKEY,
- &process_authority_lookup_ns,
- rh);
-
-}
-
-/**
- * Entry point for name resolution
- * Setup a new query and try to resolve
- *
- * @param request the request handle of the DNS request from a client
- * @param p the DNS query packet we received
- * @param q the DNS query we received parsed from p
- */
-static void
-start_resolution_from_dns(struct GNUNET_DNS_RequestHandle *request,
- struct GNUNET_DNSPARSER_Packet *p,
- struct GNUNET_DNSPARSER_Query *q)
-{
- struct GNUNET_GNS_ResolverHandle *rh;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting resolution for %s (type=%d)!\n",
- q->name, q->type);
-
- rh = GNUNET_malloc(sizeof (struct GNUNET_GNS_ResolverHandle));
- rh->packet = p;
- rh->query = q;
- rh->authority = zone_hash;
-
-
- 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));
-
- rh->authority_name = GNUNET_malloc(sizeof(char)*MAX_DNS_LABEL_LENGTH);
-
- rh->request_handle = request;
-
- rh->authority_chain_head = GNUNET_malloc(sizeof(struct AuthorityChain));
- rh->authority_chain_tail = rh->authority_chain_head;
- rh->authority_chain_head->zone = zone_hash;
-
- /* Start resolution in our zone */
- rh->proc = &process_ns_delegation_dns;
- resolve_delegation_from_ns(rh);
-}
-
-/**
- * The DNS request handler
- * Called for every incoming DNS request.
- *
- * @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
- */
-static void
-handle_dns_request(void *cls,
- struct GNUNET_DNS_RequestHandle *rh,
- size_t request_length,
- const char *request)
-{
- struct GNUNET_DNSPARSER_Packet *p;
- char *tldoffset;
-
- 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_WARNING,
- "Received malformed DNS packet, leaving it untouched\n");
- GNUNET_DNS_request_forward (rh);
- 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).
- */
- if (p->num_queries == 0)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "No Queries in DNS packet... forwarding\n");
- 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_from_dns(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);
- }
-
-}
-
-/**
- * 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);
-}
-
-/**
- * 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_start(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-
-/**
- * Function used to put all records successively into the DHT.
- *
- * @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
- */
-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)
+send_shorten_response (void* cls, const char* name)
{
+ struct ClientShortenHandle *csh = cls;
+ struct GNUNET_GNS_ClientShortenResultMessage *rmsg;
+ size_t name_len;
- 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;
-
- /* we're done */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending `%s' message with %s\n",
+ "SHORTEN_RESULT", name);
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;
- }
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Putting records for %s into the DHT\n", name);
-
- rd_payload_length = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
-
- nrb = GNUNET_malloc(rd_payload_length + strlen(name) + 1
- + sizeof(struct GNSNameRecordBlock));
-
- if (signature != NULL)
- nrb->signature = *signature;
-
- nrb->public_key = *key;
-
- nrb->rd_count = htonl(rd_count);
-
- memset(&nrb[1], 0, strlen(name) + 1);
- memcpy(&nrb[1], name, strlen(name));
-
- nrb_data = (char*)&nrb[1];
- nrb_data += strlen(name) + 1;
-
- rd_payload_length += sizeof(struct GNSNameRecordBlock) +
- strlen(name) + 1;
-
- 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
- }
-
-
- /*
- * calculate DHT key: H(name) xor H(pubkey)
- */
- GNUNET_CRYPTO_hash(name, strlen(name), &name_hash);
- GNUNET_CRYPTO_hash_xor(&zone_hash, &name_hash, &xor_hash);
- GNUNET_CRYPTO_hash_to_enc (&xor_hash, &xor_hash_string);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "putting records for %s under key: %s with size %d\n",
- name, (char*)&xor_hash_string, rd_payload_length);
-
- GNUNET_DHT_put (dht_handle, &xor_hash,
- 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++;
-
- /**
- * Reschedule periodic put
- */
- zone_update_taskid = GNUNET_SCHEDULER_add_delayed (dht_update_interval,
- &update_zone_dht_next,
- NULL);
-
-}
-
-/**
- * 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_DEBUG, "Starting DHT zone update!\n");
- if (0 == num_public_records)
- {
- dht_update_interval = GNUNET_TIME_relative_multiply(
- GNUNET_TIME_UNIT_SECONDS,
- 1);
- }
+ name_len = 0;
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);
-}
-
-//Prototype
-static void send_shorten_response(const char* name,
- struct ClientShortenHandle *csh);
-static void
-process_shorten_pseu_lookup_ns(void *cls,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
- struct GNUNET_TIME_Absolute expire,
- const char *name,
- unsigned int rd_len,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_RsaSignature *signature)
-{
- struct GNUNET_GNS_ResolverHandle *rh =
- (struct GNUNET_GNS_ResolverHandle *)cls;
- struct GNUNET_TIME_Relative remaining_time;
-
-
- rh->status = 0;
-
- if (name != NULL)
- {
- rh->status |= EXISTS;
- }
-
- if (remaining_time.rel_value == 0)
- {
- rh->status |= EXPIRED;
- }
+ name_len = strlen (name) + 1;
+ GNUNET_STATISTICS_update (statistics,
+ "Name shorten results", 1, GNUNET_NO);
- rh->proc(cls, rh, rd_len, rd);
+ rmsg = GNUNET_malloc (sizeof (struct GNUNET_GNS_ClientShortenResultMessage) +
+ name_len);
+
+ rmsg->id = csh->request_id;
+ rmsg->header.type = htons(GNUNET_MESSAGE_TYPE_GNS_SHORTEN_RESULT);
+ rmsg->header.size =
+ htons(sizeof(struct GNUNET_GNS_ClientShortenResultMessage) +
+ name_len);
+ memcpy (&rmsg[1], name, name_len);
+ GNUNET_SERVER_notification_context_unicast (nc, csh->client,
+ &rmsg->header,
+ GNUNET_NO);
+ if (NULL != csh->namestore_task)
+ GNUNET_NAMESTORE_cancel (csh->namestore_task);
+ GNUNET_free (rmsg);
+ GNUNET_free (csh);
}
/**
- * Start DHT lookup for a PSEUdonym record in
- * rh->authority's zone
+ * Lookup the zone infos and shorten name
+ *
+ * @param cls the client shorten handle
+ * @param key key of the zone
+ * @param expiration expiration of record
+ * @param name name found or null if no result
+ * @param rd_count number of records found
+ * @param rd record data
+ * @param signature
*
- * @param rh the pending gns query
- * @param name the name of the PKEY record
*/
static void
-resolve_pseu_from_dht(struct GNUNET_GNS_ResolverHandle *rh)
+process_shorten_in_private_zone_lookup (void *cls,
+ const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *key,
+ struct GNUNET_TIME_Absolute expiration,
+ const char *name,
+ unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd,
+ const struct GNUNET_CRYPTO_EccSignature *signature)
{
- uint32_t xquery;
- GNUNET_HashCode name_hash;
- GNUNET_HashCode lookup_key;
-
- //Empty string
- GNUNET_CRYPTO_hash("",
- 1,
- &name_hash);
-
- GNUNET_CRYPTO_hash_xor(&name_hash, &rh->authority, &lookup_key);
-
- rh->dht_timeout_task = GNUNET_SCHEDULER_add_delayed (DHT_LOOKUP_TIMEOUT,
- &dht_lookup_timeout,
- rh);
+ struct ClientShortenHandle *csh = cls;
+ struct GNUNET_CRYPTO_ShortHashCode *szone = &csh->shorten_zone;
+ struct GNUNET_CRYPTO_ShortHashCode *pzone = &csh->private_zone;
+
+ csh->namestore_task = NULL;
+ if (0 == strcmp (csh->private_zone_id, ""))
+ pzone = NULL;
+ if (0 == rd_count)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "No shorten zone in private zone!\n");
+ strcpy (csh->shorten_zone_id, "");
+ szone = NULL;
+ }
+ else
+ {
+ GNUNET_break (1 == rd_count);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Shorten zone %s found in private zone %s\n",
+ name, csh->private_zone_id);
- xquery = htonl(GNUNET_GNS_RECORD_PSEU);
-
- rh->get_handle = GNUNET_DHT_get_start(dht_handle,
- DHT_OPERATION_TIMEOUT,
- GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
- &lookup_key,
- DHT_GNS_REPLICATION_LEVEL,
- GNUNET_DHT_RO_NONE,
- &xquery,
- sizeof(xquery),
- &process_authority_dht_result,
- rh);
+ sprintf (csh->shorten_zone_id, "%s.%s", name, csh->private_zone_id);
+ }
+ GNUNET_CONTAINER_DLL_remove (csh_head, csh_tail, csh);
+ gns_resolver_shorten_name (&csh->root_zone,
+ pzone,
+ szone,
+ csh->name,
+ csh->private_zone_id,
+ csh->shorten_zone_id,
+ &send_shorten_response, csh);
}
-//Prototype
-static void
-handle_shorten_pseu_ns_result(void* cls,
- struct GNUNET_GNS_ResolverHandle *rh,
- uint32_t rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd);
+/**
+ * Lookup the zone infos and shorten name
+ *
+ * @param cls the shorten handle
+ * @param key key of the zone
+ * @param expiration expiration of record
+ * @param name name found or null if no result
+ * @param rd_count number of records found
+ * @param rd record data
+ * @param signature
+ *
+ */
static void
-handle_shorten_zone_to_name(void *cls,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
- struct GNUNET_TIME_Absolute expire,
- const char *name,
- unsigned int rd_len,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_RsaSignature *signature)
+process_shorten_in_root_zone_lookup (void *cls,
+ const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *key,
+ struct GNUNET_TIME_Absolute expiration,
+ const char *name,
+ unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd,
+ const struct GNUNET_CRYPTO_EccSignature *signature)
{
- struct GNUNET_GNS_ResolverHandle *rh =
- (struct GNUNET_GNS_ResolverHandle *)cls;
- struct ClientShortenHandle* csh = (struct ClientShortenHandle*) rh->proc_cls;
-
- char* result;
-
- /* we found a match in our own zone */
- if (rd_len != 0)
+ struct ClientShortenHandle *csh = cls;
+ struct GNUNET_CRYPTO_ShortHashCode *szone = &csh->shorten_zone;
+ struct GNUNET_CRYPTO_ShortHashCode *pzone = &csh->private_zone;
+
+ csh->namestore_task = NULL;
+ if (0 == strcmp (csh->private_zone_id, ""))
+ pzone = NULL;
+ if (0 == rd_count)
{
- result = GNUNET_malloc(strlen(rh->name) + strlen(name) + 1);
- memset(result, 0, strlen(rh->name) + strlen(name) + 1);
- memcpy(result, rh->name, strlen(rh->name));
- memcpy(result+strlen(rh->name)+1, name, strlen(name));
-
- send_shorten_response(result, csh);
-
- GNUNET_free(result);
- }
- else
- {
- /**
- * Nothing in our zone
- * check PSEU for this authority in namestore
- */
- rh->proc = &handle_shorten_pseu_ns_result;
- GNUNET_NAMESTORE_lookup_record(namestore_handle,
- &rh->authority_chain_head->zone,
- "",
- GNUNET_GNS_RECORD_PSEU,
- &process_shorten_pseu_lookup_ns,
- rh);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "No shorten zone in zone and no private zone!\n");
+
+ strcpy (csh->shorten_zone_id, "");
+ GNUNET_CONTAINER_DLL_remove (csh_head, csh_tail, csh);
+ szone = NULL;
+ gns_resolver_shorten_name (&csh->root_zone,
+ pzone,
+ szone,
+ csh->name,
+ csh->private_zone_id,
+ csh->shorten_zone_id,
+ &send_shorten_response, csh);
+ return;
}
+ GNUNET_break (rd_count == 1);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Private zone %s found in root zone\n", name);
+ strcpy (csh->private_zone_id, name);
+ csh->namestore_task = GNUNET_NAMESTORE_zone_to_name (namestore_handle,
+ pzone,
+ szone,
+ &process_shorten_in_private_zone_lookup,
+ csh);
}
+
/**
- * Process result from namestore delegation lookup
- * for shorten operation
+ * Lookup the zone infos and shorten name
*
- * @param cls the client shorten handle
- * @param rh the resolver handle
- * @param rd_count number of results (0)
- * @param rd data (NULL)
+ * @param cls the shorten handle
+ * @param key key of the zone
+ * @param expiration expiration of record
+ * @param name name found or null if no result
+ * @param rd_count number of records found
+ * @param rd record data
+ * @param signature
*/
-void
-handle_shorten_pseu_dht_result(void* cls,
- struct GNUNET_GNS_ResolverHandle *rh,
- uint32_t rd_len,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+static void
+process_private_in_root_zone_lookup (void *cls,
+ const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *key,
+ struct GNUNET_TIME_Absolute expiration,
+ const char *name,
+ unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd,
+ const struct GNUNET_CRYPTO_EccSignature *signature)
{
- struct ClientShortenHandle* csh = (struct ClientShortenHandle*) cls;
- struct AuthorityChain *auth_chain;
- char* pseu;
- char* result;
- char* new_name;
- int i;
-
- /**
- * PSEU found
- */
- if (rd_len != 0)
- {
- for (i=0; i < rd_len; i++)
- {
- if (rd[i].record_type == GNUNET_GNS_RECORD_PSEU)
- break;
- }
-
- pseu = (char*) rd[i].data;
- result = GNUNET_malloc(strlen(rh->name) + strlen(pseu) + 1);
- memset(result, 0, strlen(rh->name) + strlen(pseu) + 1);
- memcpy(result, rh->name, strlen(rh->name));
- memcpy(result+strlen(rh->name)+1, pseu, strlen(pseu));
-
- send_shorten_response(result, csh);
-
- GNUNET_free(result);
- return;
- }
-
- /**
- * No PSEU found.
- * continue with next authority
- * backtrack
- */
- auth_chain = rh->authority_chain_head;
+ struct ClientShortenHandle *csh = cls;
- if ((auth_chain->next->next == NULL) &&
- GNUNET_CRYPTO_hash_cmp(&auth_chain->next->zone, &zone_hash) == 0)
+ csh->namestore_task = NULL;
+ if (0 == rd_count)
{
- /**
- * Our zone is next
- */
- result = GNUNET_malloc(strlen(rh->name) + strlen(auth_chain->name) + 2);
- memset(result, 0, strlen(rh->name) + strlen(auth_chain->name) + 2);
- strcpy(result, rh->name);
- strcpy(result+strlen(rh->name)+1, ".");
- strcpy(result+strlen(rh->name)+2, auth_chain->name);
- send_shorten_response(result, csh);
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "No private zone in root zone\n");
+ strcpy (csh->private_zone_id, "");
+ csh->namestore_task = GNUNET_NAMESTORE_zone_to_name (namestore_handle,
+ &csh->root_zone,
+ &csh->shorten_zone,
+ &process_shorten_in_root_zone_lookup,
+ csh);
return;
}
-
- /**
- * Continue with next authority
- */
- new_name = GNUNET_malloc(strlen(rh->name)+
- strlen(auth_chain->name) + 2);
- memset(new_name, 0, strlen(rh->name)+
- strlen(auth_chain->name) + 2);
- strcpy(new_name, rh->name);
- strcpy(new_name+strlen(rh->name)+1, ".");
- strcpy(new_name+strlen(rh->name)+2, auth_chain->name);
- GNUNET_CONTAINER_DLL_remove(rh->authority_chain_head,
- rh->authority_chain_tail,
- auth_chain);
- GNUNET_free(auth_chain->name);
- GNUNET_free(auth_chain);
- GNUNET_NAMESTORE_zone_to_name (namestore_handle,
- &zone_hash,
- &rh->authority_chain_head->zone,
- &handle_shorten_zone_to_name,
- rh);
-
+ GNUNET_break (1 == rd_count);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Private zone `%s' found in root zone\n",
+ name);
+ strcpy (csh->private_zone_id, name);
+ csh->namestore_task = GNUNET_NAMESTORE_zone_to_name (namestore_handle,
+ &csh->private_zone,
+ &csh->shorten_zone,
+ &process_shorten_in_private_zone_lookup,
+ csh);
}
-
/**
- * Process result from namestore PSEU lookup
- * for shorten operation
- * FIXME do we need to check for own zone here?
+ * Handle a shorten message from the api
*
- * @param cls the client shorten handle
- * @param rh the resolver handle
- * @param rd_count number of results (0 if none found)
- * @param rd data (NULL if none found)
+ * @param cls the closure (unused)
+ * @param client the client
+ * @param message the message
*/
-static void
-handle_shorten_pseu_ns_result(void* cls,
- struct GNUNET_GNS_ResolverHandle *rh,
- uint32_t rd_len,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+static void
+handle_shorten (void *cls,
+ struct GNUNET_SERVER_Client * client,
+ const struct GNUNET_MessageHeader * message)
{
- struct ClientShortenHandle* csh = (struct ClientShortenHandle*) cls;
- struct AuthorityChain *auth_chain;
- char* pseu;
- char* result;
- char* new_name;
- int i;
-
- /**
- * PSEU found
- */
- if (rd_len != 0)
- {
- for (i=0; i < rd_len; i++)
- {
- if (rd[i].record_type == GNUNET_GNS_RECORD_PSEU)
- break;
- }
-
- pseu = (char*) rd[i].data;
- result = GNUNET_malloc(strlen(rh->name) + strlen(pseu) + 1);
- memset(result, 0, strlen(rh->name) + strlen(pseu) + 1);
- memcpy(result, rh->name, strlen(rh->name));
- memcpy(result+strlen(rh->name)+1, pseu, strlen(pseu));
-
- send_shorten_response(result, csh);
+ struct ClientShortenHandle *csh;
+ const char *utf_in;
+ char name[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
+ char* nameptr = name;
+ uint16_t msg_size;
+ const struct GNUNET_GNS_ClientShortenMessage *sh_msg;
- GNUNET_free(result);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s' message\n", "SHORTEN");
+ msg_size = ntohs (message->size);
+ if (msg_size < sizeof (struct GNUNET_GNS_ClientShortenMessage))
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
-
- /**
- * No PSEU found. Ask DHT if expired.
- * Else contunue with next authority
- */
- if (rh->status & (EXISTS | !EXPIRED))
+ sh_msg = (const struct GNUNET_GNS_ClientShortenMessage *) message;
+ utf_in = (const char *) &sh_msg[1];
+ if ('\0' != utf_in[msg_size - sizeof (struct GNUNET_GNS_ClientShortenMessage) - 1])
{
- /**
- * backtrack
- */
- auth_chain = rh->authority_chain_head;
- new_name = GNUNET_malloc(strlen(rh->name)+
- strlen(auth_chain->name) + 2);
- memset(new_name, 0, strlen(rh->name)+
- strlen(auth_chain->name) + 2);
- strcpy(new_name, rh->name);
- strcpy(new_name+strlen(rh->name)+1, ".");
- strcpy(new_name+strlen(rh->name)+2, auth_chain->name);
-
- GNUNET_CONTAINER_DLL_remove(rh->authority_chain_head,
- rh->authority_chain_tail,
- auth_chain);
-
- GNUNET_NAMESTORE_zone_to_name (namestore_handle,
- &zone_hash,
- &rh->authority_chain_head->zone,
- &handle_shorten_zone_to_name,
- rh);
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
-
- /**
- * Ask DHT
- */
- rh->authority = rh->authority_chain_head->zone;
- rh->proc = &handle_shorten_pseu_dht_result;
- resolve_pseu_from_dht(rh);
-
+ csh = GNUNET_malloc(sizeof (struct ClientShortenHandle));
+ csh->client = client;
+ csh->request_id = sh_msg->id;
+ GNUNET_CONTAINER_DLL_insert (csh_head, csh_tail, csh);
+ GNUNET_STRINGS_utf8_tolower (utf_in, &nameptr);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "SHORTEN: Converted `%s' to `%s'\n",
+ utf_in,
+ nameptr);
+ GNUNET_SERVER_notification_context_add (nc, client);
+ if (strlen (name) < strlen (GNUNET_GNS_TLD))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "SHORTEN: %s is too short\n", name);
+ GNUNET_CONTAINER_DLL_remove (csh_head, csh_tail, csh);
+ send_shorten_response(csh, name);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+ if (strlen (name) > GNUNET_DNSPARSER_MAX_NAME_LENGTH)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "SHORTEN: %s is too long\n", name);
+ GNUNET_CONTAINER_DLL_remove (csh_head, csh_tail, csh);
+ send_shorten_response(csh, name);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+ if ( (! is_gads_tld (name)) &&
+ (! is_zkey_tld (name)) )
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%s is not our domain. Returning\n", name);
+ GNUNET_CONTAINER_DLL_remove (csh_head, csh_tail, csh);
+ send_shorten_response (csh, name);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+ csh->shorten_zone = sh_msg->shorten_zone;
+ csh->private_zone = sh_msg->private_zone;
+ strcpy (csh->name, name);
+ if (1 == ntohl(sh_msg->use_default_zone))
+ csh->root_zone = zone_hash; //Default zone
+ else
+ csh->root_zone = sh_msg->zone;
+ csh->namestore_task = GNUNET_NAMESTORE_zone_to_name (namestore_handle,
+ &csh->root_zone,
+ &csh->private_zone,
+ &process_private_in_root_zone_lookup,
+ csh);
+ GNUNET_STATISTICS_update (statistics,
+ "Name shorten attempts", 1, GNUNET_NO);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
-
/**
- * Process result from namestore delegation lookup
- * for shorten operation
- *
- * @param cls the client shorten handle
- * @param rh the resolver handle
- * @param rd_count number of results (0)
- * @param rd data (NULL)
+ * Send get authority response back to client
+ *
+ * @param cls the closure containing a client get auth handle
+ * @param name the name of the authority, or NULL on error
*/
-void
-handle_shorten_delegation_result(void* cls,
- struct GNUNET_GNS_ResolverHandle *rh,
- uint32_t rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+static void
+send_get_auth_response (void *cls,
+ const char* name)
{
- struct ClientShortenHandle* csh = (struct ClientShortenHandle*) cls;
- struct AuthorityChain *auth_chain;
-
- /**
- * At this point rh->name contains the part of the name
- * that we do not have a PKEY in our namestore to resolve.
- * The authority chain in the resolver handle is now
- * useful to backtrack if needed
- */
+ struct ClientGetAuthHandle *cah = cls;
+ struct GNUNET_GNS_ClientGetAuthResultMessage *rmsg;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "PKEY resolved as far as possible in ns up to %s!\n", rh->name);
-
- if (GNUNET_CRYPTO_hash_cmp(&rh->authority_chain_head->zone,
- &zone_hash) == 0)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending `%s' message with `%s'\n",
+ "GET_AUTH_RESULT", name);
+ if (NULL != name)
{
- /**
- * This is our zone append .gnunet unless name is empty
- * (it shouldn't be, usually FIXME what happens if we
- * shorten to our zone to a "" record??)
- **/
- send_shorten_response(rh->name, csh); //FIXME +.gnunet!
- //FIXME free
- return;
- }
- csh->offset++; //FIXME needed?
- auth_chain = rh->authority_chain_head;
- /* backtrack authorities for pseu */
- GNUNET_NAMESTORE_zone_to_name (namestore_handle,
- &zone_hash, //ours
- &auth_chain->zone,
- &handle_shorten_zone_to_name,
- rh);
-
+ GNUNET_STATISTICS_update (statistics,
+ "Authorities resolved", 1, GNUNET_NO);
+ }
+ if (NULL == name)
+ name = "";
+ rmsg = GNUNET_malloc (sizeof (struct GNUNET_GNS_ClientGetAuthResultMessage)
+ + strlen (name) + 1);
+
+ rmsg->id = cah->request_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,
+ &rmsg->header,
+ GNUNET_NO);
+ GNUNET_SERVER_receive_done (cah->client, GNUNET_OK);
+ GNUNET_free(rmsg);
+ GNUNET_free_non_null(cah->name);
+ GNUNET_free(cah);
}
-typedef void (*ShortenResponseProc) (void* cls, const char* name);
/**
- * Shorten a given name
+ * Handle a get authority message from the api
*
- * @param name the name to shorten
- * @param proc the processor to call when finished
- * @praram cls the closure to the processor
+ * @param cls the closure
+ * @param client the client
+ * @param message the message
*/
-static void
-shorten_name(char* name, struct ClientShortenHandle* csh)
+static void
+handle_get_authority (void *cls,
+ struct GNUNET_SERVER_Client * client,
+ const struct GNUNET_MessageHeader * message)
{
+ struct ClientGetAuthHandle *cah;
+ const char *utf_in;
+ char name[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
+ char* nameptr = name;
+ uint16_t msg_size;
+ const struct GNUNET_GNS_ClientGetAuthMessage *sh_msg;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s' message\n", "GET_AUTH");
+ msg_size = ntohs(message->size);
+ if (msg_size < sizeof (struct GNUNET_GNS_ClientGetAuthMessage))
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ GNUNET_SERVER_notification_context_add (nc, client);
+ sh_msg = (const struct GNUNET_GNS_ClientGetAuthMessage *) message;
+ utf_in = (const char *) &sh_msg[1];
+ if ('\0' != utf_in[msg_size - sizeof (struct GNUNET_GNS_ClientGetAuthMessage) - 1])
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ GNUNET_STRINGS_utf8_tolower(utf_in, &nameptr);
+ cah = GNUNET_malloc(sizeof(struct ClientGetAuthHandle));
+ cah->client = client;
+ cah->request_id = sh_msg->id;
+ if (strlen (name) < strlen(GNUNET_GNS_TLD))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GET_AUTH: `%s' is too short. Returning\n", name);
+ cah->name = NULL;
+ send_get_auth_response(cah, name);
+ return;
+ }
+ if (strlen (name) > GNUNET_DNSPARSER_MAX_NAME_LENGTH)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GET_AUTH: `%s' is too long", name);
+ cah->name = NULL;
+ send_get_auth_response(cah, name);
+ return;
+ }
+ if (0 != strcmp (name + strlen (name) - strlen (GNUNET_GNS_TLD),
+ GNUNET_GNS_TLD))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GET_AUTH: %s is not our domain. Returning\n", name);
+ cah->name = NULL;
+ send_get_auth_response (cah, name);
+ return;
+ }
- struct GNUNET_GNS_ResolverHandle *rh;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting resolution for %s (type=%d)!\n",
- name, GNUNET_GNS_RECORD_PKEY);
-
- rh = GNUNET_malloc(sizeof (struct GNUNET_GNS_ResolverHandle));
- rh->authority = zone_hash;
+ if (0 == strcmp (name, GNUNET_GNS_TLD))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GET_AUTH: %s is us. Returning\n", name);
+ cah->name = NULL;
+ send_get_auth_response(cah, name);
+ return;
+ }
- rh->name = GNUNET_malloc(strlen(name)
- - strlen(gnunet_tld) + 1);
- memset(rh->name, 0,
- strlen(name)-strlen(gnunet_tld) + 1);
- memcpy(rh->name, name,
- strlen(name)-strlen(gnunet_tld));
-
- csh->name = GNUNET_malloc(strlen(name)
- - strlen(gnunet_tld) + 1);
- memset(rh->name, 0,
- strlen(name)-strlen(gnunet_tld) + 1);
- memcpy(rh->name, name,
- strlen(name)-strlen(gnunet_tld));
-
- rh->authority_name = GNUNET_malloc(sizeof(char)*MAX_DNS_LABEL_LENGTH);
-
- rh->authority_chain_head = GNUNET_malloc(sizeof(struct AuthorityChain));
- rh->authority_chain_tail = rh->authority_chain_head;
- rh->authority_chain_head->zone = zone_hash;
- rh->proc = &handle_shorten_delegation_result;
- rh->proc_cls = (void*)csh;
+ cah->name = GNUNET_malloc (strlen (name)
+ - strlen (GNUNET_GNS_TLD) + 1);
+ memcpy (cah->name, name,
+ strlen (name) - strlen (GNUNET_GNS_TLD));
/* Start delegation resolution in our namestore */
- resolve_delegation_from_ns(rh);
-
+ gns_resolver_get_authority (zone_hash, zone_hash, name,
+ &send_get_auth_response, cah);
+ GNUNET_STATISTICS_update (statistics,
+ "Authority lookup attempts", 1, GNUNET_NO);
}
+
/**
- * Send shorten response back to client
- * FIXME this is without .gnunet!
- *
- * @param cls the client handle in closure
- * @param name the shortened name result or NULL if cannot be shortened
+ * Reply to client with the result from our lookup.
+ *
+ * @param cls the closure (our client lookup handle)
+ * @param rd_count the number of records
+ * @param rd the record data
*/
static void
-send_shorten_response(const char* name, struct ClientShortenHandle *csh)
+send_lookup_response (void* cls,
+ uint32_t rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message\n",
- "SHORTEN_RESULT");
- struct GNUNET_GNS_ClientShortenResultMessage *rmsg;
+ struct ClientLookupHandle* clh = cls;
+ struct GNUNET_GNS_ClientLookupResultMessage *rmsg;
+ size_t len;
- if (name == NULL)
- {
- name = '\0';
- }
-
- rmsg = GNUNET_malloc(sizeof(struct GNUNET_GNS_ClientShortenResultMessage *)
- + strlen(name));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message with %d results\n",
+ "LOOKUP_RESULT", rd_count);
- rmsg->unique_id = csh->unique_id;
- rmsg->key = csh->key;
- rmsg->header.type = htons(GNUNET_MESSAGE_TYPE_GNS_SHORTEN_RESULT);
+ len = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
+ rmsg = GNUNET_malloc (len + sizeof (struct GNUNET_GNS_ClientLookupResultMessage));
+
+ rmsg->id = clh->request_id;
+ rmsg->rd_count = htonl(rd_count);
+ rmsg->header.type = htons(GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT);
rmsg->header.size =
- htons(sizeof(struct GNUNET_GNS_ClientShortenResultMessage *) +
- strlen(name));
-
- 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);
+ htons(len+sizeof(struct GNUNET_GNS_ClientLookupResultMessage));
+
+ 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(csh);
GNUNET_free(rmsg);
-
+ GNUNET_free(clh->name);
+
+ if (NULL != clh->shorten_key)
+ GNUNET_CRYPTO_ecc_key_free (clh->shorten_key);
+ GNUNET_free (clh);
+ GNUNET_STATISTICS_update (statistics,
+ "Completed lookups", 1, GNUNET_NO);
+ if (NULL != rd)
+ GNUNET_STATISTICS_update (statistics,
+ "Records resolved", rd_count, GNUNET_NO);
}
+
/**
- * Handle a shorten message from the api
+ * Handle lookup requests from client
*
* @param cls the closure
* @param client the client
* @param message the message
*/
-static void handle_shorten(void *cls,
- struct GNUNET_SERVER_Client * client,
- const struct GNUNET_MessageHeader * message)
+static void
+handle_lookup (void *cls,
+ struct GNUNET_SERVER_Client * client,
+ const struct GNUNET_MessageHeader * message)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "SHORTEN");
-
- size_t msg_size = 0;
- struct ClientShortenHandle *csh;
-
- if (ntohs (message->size) != sizeof (struct GNUNET_GNS_ClientShortenMessage))
+ size_t namelen;
+ char name[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
+ struct ClientLookupHandle *clh;
+ char* nameptr = name;
+ const char *utf_in;
+ int only_cached;
+ struct GNUNET_CRYPTO_EccPrivateKey *key;
+ struct GNUNET_CRYPTO_EccPrivateKeyBinaryEncoded *pkey;
+ char* tmp_pkey;
+ uint16_t msg_size;
+ const struct GNUNET_GNS_ClientLookupMessage *sh_msg;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s' message\n", "LOOKUP");
+ msg_size = ntohs(message->size);
+ if (msg_size < sizeof (struct GNUNET_GNS_ClientLookupMessage))
{
- GNUNET_break_op (0);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
+ sh_msg = (const struct GNUNET_GNS_ClientLookupMessage *) message;
+ GNUNET_SERVER_notification_context_add (nc, client);
+ if (GNUNET_YES == ntohl (sh_msg->have_key))
+ {
+ pkey = (struct GNUNET_CRYPTO_EccPrivateKeyBinaryEncoded *) &sh_msg[1];
+ tmp_pkey = (char*) &sh_msg[1];
+ key = GNUNET_CRYPTO_ecc_decode_key (tmp_pkey, ntohs (pkey->size),
+ GNUNET_NO);
+ GNUNET_STRINGS_utf8_tolower (&tmp_pkey[ntohs (pkey->size)], &nameptr);
+ }
+ else
+ {
+ key = NULL;
+ utf_in = (const char *) &sh_msg[1];
+ if ('\0' != utf_in[msg_size - sizeof (struct GNUNET_GNS_ClientLookupMessage) - 1])
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ GNUNET_STRINGS_utf8_tolower (utf_in, &nameptr);
+ }
+
+ namelen = strlen (name) + 1;
+ clh = GNUNET_malloc (sizeof (struct ClientLookupHandle));
+ memset (clh, 0, sizeof (struct ClientLookupHandle));
+ clh->client = client;
+ clh->name = GNUNET_malloc (namelen);
+ strcpy (clh->name, name);
+ clh->request_id = sh_msg->id;
+ clh->type = ntohl (sh_msg->type);
+ clh->shorten_key = key;
- struct GNUNET_GNS_ClientShortenMessage *sh_msg =
- (struct GNUNET_GNS_ClientShortenMessage *) message;
+ only_cached = ntohl (sh_msg->only_cached);
- msg_size = ntohs(message->size);
+ if (strlen (name) > GNUNET_DNSPARSER_MAX_NAME_LENGTH) {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "LOOKUP: %s is too long", name);
+ clh->name = NULL;
+ send_lookup_response (clh, 0, NULL);
+ return;
+ }
- if (msg_size > GNUNET_SERVER_MAX_MESSAGE_SIZE)
+ if ((GNUNET_GNS_RECORD_A == clh->type) &&
+ (GNUNET_OK != v4_enabled))
{
- GNUNET_break_op (0);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "LOOKUP: Query for A record but AF_INET not supported!");
+ clh->name = NULL;
+ send_lookup_response (clh, 0, NULL);
+ return;
+ }
+
+ if ((GNUNET_GNS_RECORD_AAAA == clh->type) &&
+ (GNUNET_OK != v6_enabled))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "LOOKUP: Query for AAAA record but AF_INET6 not supported!");
+ clh->name = NULL;
+ send_lookup_response (clh, 0, NULL);
return;
}
-
- csh = GNUNET_malloc(sizeof(struct ClientShortenHandle));
- csh->client = client;
- csh->unique_id = sh_msg->unique_id;
- csh->key = sh_msg->key;
- //Offset in original name
- csh->offset = 0;
+ if (1 == ntohl (sh_msg->use_default_zone))
+ clh->zone = zone_hash; /* Default zone */
+ else
+ clh->zone = sh_msg->zone;
-
- shorten_name((char*)&sh_msg[1], csh);
-
+ if (GNUNET_YES == auto_import_pkey)
+ {
+ gns_resolver_lookup_record (clh->zone, clh->zone, clh->type, clh->name,
+ clh->shorten_key,
+ default_lookup_timeout,
+ clh->only_cached,
+ &send_lookup_response, clh);
+ }
+ else
+ {
+ gns_resolver_lookup_record (clh->zone, clh->zone, clh->type, name,
+ NULL,
+ default_lookup_timeout,
+ only_cached,
+ &send_lookup_response, clh);
+ }
+ GNUNET_STATISTICS_update (statistics,
+ "Record lookup attempts", 1, GNUNET_NO);
}
-/**
- * TODO
- */
-static void
-handle_lookup(void *cls,
- struct GNUNET_SERVER_Client * client,
- const struct GNUNET_MessageHeader * message)
-{
-}
/**
* Process GNS requests.
*
- * @param cls closure)
+ * @param cls closure
* @param server the initialized server
* @param c configuration to use
*/
run (void *cls, struct GNUNET_SERVER_Handle *server,
const struct GNUNET_CONFIGURATION_Handle *c)
{
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Initializing GNS\n");
-
- char* keyfile;
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
-
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_lookup, NULL, GNUNET_MESSAGE_TYPE_GNS_LOOKUP, 0},
+ {&handle_get_authority, NULL, GNUNET_MESSAGE_TYPE_GNS_GET_AUTH, 0}
};
+ char* keyfile;
+ struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pkey;
+ unsigned long long max_parallel_bg_queries = 0;
+ int ignore_pending = GNUNET_NO;
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (c, "gns",
- "ZONEKEY", &keyfile))
+ v6_enabled = GNUNET_NETWORK_test_pf (PF_INET6);
+ v4_enabled = GNUNET_NETWORK_test_pf (PF_INET);
+
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (c, "gns",
+ "ZONEKEY", &keyfile))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "No private key for root zone specified%s!\n", keyfile);
- GNUNET_SCHEDULER_shutdown(0);
+ "No private key for root zone specified!\n");
+ GNUNET_SCHEDULER_shutdown ();
return;
}
- zone_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
- GNUNET_CRYPTO_rsa_key_get_public (zone_key, &pkey);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Using keyfile %s for root zone.\n", keyfile);
- GNUNET_CRYPTO_hash(&pkey, sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ zone_key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
+ GNUNET_CRYPTO_ecc_key_get_public (zone_key, &pkey);
+ GNUNET_CRYPTO_short_hash(&pkey,
+ sizeof(struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
&zone_hash);
+ GNUNET_free(keyfile);
+ namestore_handle = GNUNET_NAMESTORE_connect (c);
+ if (NULL == namestore_handle)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Failed to connect to the namestore!\n"));
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
-
+ auto_import_pkey = GNUNET_NO;
if (GNUNET_YES ==
GNUNET_CONFIGURATION_get_value_yesno (c, "gns",
- "HIJACK_DNS"))
+ "AUTO_IMPORT_PKEY"))
{
- 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");
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Automatic PKEY import is enabled.\n");
+ auto_import_pkey = GNUNET_YES;
}
+ put_interval = INITIAL_PUT_INTERVAL;
+ zone_publish_time_window = DEFAULT_ZONE_PUBLISH_TIME_WINDOW;
-
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_time (c, "gns",
+ "ZONE_PUBLISH_TIME_WINDOW",
+ &zone_publish_time_window))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Time window for zone iteration: %s\n",
+ GNUNET_STRINGS_relative_time_to_string (zone_publish_time_window, GNUNET_YES));
+ }
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number (c, "gns",
+ "MAX_PARALLEL_BACKGROUND_QUERIES",
+ &max_parallel_bg_queries))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Number of allowed parallel background queries: %llu\n",
+ max_parallel_bg_queries);
+ }
- /**
- * handle to our local namestore
- */
- namestore_handle = GNUNET_NAMESTORE_connect(c);
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (c, "gns",
+ "AUTO_IMPORT_CONFIRMATION_REQ"))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Auto import requires user confirmation\n");
+ ignore_pending = GNUNET_YES;
+ }
- if (NULL == namestore_handle)
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_time (c, "gns",
+ "DEFAULT_LOOKUP_TIMEOUT",
+ &default_lookup_timeout))
{
- //FIXME do error handling;
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Failed to connect to the namestore!\n");
- GNUNET_SCHEDULER_shutdown(0);
- return;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Default lookup timeout: %s\n",
+ GNUNET_STRINGS_relative_time_to_string (default_lookup_timeout,
+ GNUNET_YES));
}
- /**
- * handle to the dht
- */
- dht_handle = GNUNET_DHT_connect(c, 1); //FIXME get ht_len from cfg
-
+ dht_handle = GNUNET_DHT_connect (c,
+ (unsigned int) max_parallel_bg_queries);
if (NULL == dht_handle)
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Could not connect to DHT!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Could not connect to DHT!\n"));
+ GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ return;
+ }
+
+ if (GNUNET_SYSERR ==
+ gns_resolver_init (namestore_handle, dht_handle, zone_hash, c,
+ max_parallel_bg_queries,
+ ignore_pending))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Unable to initialize resolver!\n"));
+ GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ return;
}
- //put_some_records(); //FIXME for testing
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (c, "gns", "HIJACK_DNS"))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "DNS hijacking enabled. Connecting to DNS service.\n");
+
+ if (GNUNET_SYSERR ==
+ gns_interceptor_init (zone_hash, zone_key, c))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ "Failed to enable the DNS interceptor!\n");
+ }
+ }
/**
* 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,
- 1);
- //zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_start, NULL);
-
+ first_zone_iteration = GNUNET_YES;
+ zone_publish_task = GNUNET_SCHEDULER_add_now (&publish_zone_dht_start, NULL);
GNUNET_SERVER_add_handlers (server, handlers);
-
- //FIXME
- //GNUNET_SERVER_disconnect_notify (server,
- // &client_disconnect_notification,
- // NULL);
-
+ statistics = GNUNET_STATISTICS_create ("gns", c);
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