/*
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
+
+/**
+ * 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)
-/* 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
+/**
+ * The factor the current zone iteration interval is divided by for each
+ * additional new record
+ */
+#define LATE_ITERATION_SPEEDUP_FACTOR 2
/**
*/
struct ClientShortenHandle
{
- /* the requesting client that */
+
+ /**
+ * List for all shorten requests
+ */
+ struct ClientShortenHandle *next;
+
+ /**
+ * List for all shorten requests
+ */
+ struct ClientShortenHandle *prev;
+
+ /**
+ * Handle to the requesting client
+ */
struct GNUNET_SERVER_Client *client;
- /* request id */
- uint64_t unique_id;
+ /**
+ * 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 */
+ /**
+ * request type
+ */
enum GNUNET_GNS_RecordType type;
- /* name to shorten */
- char* name;
+ /**
+ * name to shorten
+ */
+ char name[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
+
+ /**
+ * 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];
};
/**
- * Handle to a get auhtority operation from api
+ * Handle to a get authority operation from api
*/
struct ClientGetAuthHandle
{
- /* the requesting client that */
+ /**
+ * Handle to the requesting client
+ */
struct GNUNET_SERVER_Client *client;
- /* request id */
- uint64_t unique_id;
+ /**
+ * name to lookup authority
+ */
+ char *name;
- /* name to lookup authority */
- char* name;
+ /**
+ * request id
+ */
+ uint32_t request_id;
};
*/
struct ClientLookupHandle
{
- /* the requesting client that */
+
+ /**
+ * Handle to the requesting client
+ */
struct GNUNET_SERVER_Client *client;
- /* request id */
- uint64_t unique_id;
+ /**
+ * optional zone private key used for shorten
+ */
+ struct GNUNET_CRYPTO_EccPrivateKey *shorten_key;
- /* request type */
- enum GNUNET_GNS_RecordType type;
+ /**
+ * the name to look up
+ */
+ char *name;
- /* the name to look up */
- char* name; //Needed?
+ /**
+ * The zone we look up in
+ */
+ struct GNUNET_CRYPTO_ShortHashCode zone;
+
+ /**
+ * request id
+ */
+ uint32_t request_id;
+
+ /**
+ * GNUNET_YES if we only want to lookup from local cache
+ */
+ int only_cached;
+
+ /**
+ * request type
+ */
+ enum GNUNET_GNS_RecordType type;
};
+
/**
* 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;
/**
* Useful for zone update for DHT put
*/
-static int num_public_records = 3600;
+static unsigned long long num_public_records;
+
+/**
+ * Last seen record count
+ */
+static unsigned long long last_num_public_records;
+
+/**
+ * Zone iteration PUT interval.
+ */
+static struct GNUNET_TIME_Relative put_interval;
+
+/**
+ * Time window for zone iteration
+ */
+static struct GNUNET_TIME_Relative zone_publish_time_window;
+
+/**
+ * zone publish task
+ */
+static GNUNET_SCHEDULER_TaskIdentifier zone_publish_task;
+
+/**
+ * GNUNET_YES if automatic pkey import for name shortening
+ * is enabled
+ */
+static int auto_import_pkey;
+
+/**
+ * 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;
-/* dht update interval FIXME define? */
-static struct GNUNET_TIME_Relative dht_update_interval;
+/**
+ * Handle to the statistics service
+ */
+static struct GNUNET_STATISTICS_Handle *statistics;
-/* zone update task */
-GNUNET_SCHEDULER_TaskIdentifier zone_update_taskid = GNUNET_SCHEDULER_NO_TASK;
/**
* Task run during shutdown.
static void
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ struct ClientShortenHandle *csh_tmp;
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);
-
- GNUNET_SERVER_notification_context_destroy (nc);
-
- gns_interceptor_stop();
-
- GNUNET_NAMESTORE_disconnect(namestore_handle, 1);
- GNUNET_DHT_disconnect(dht_handle);
+ "Shutting down!\n");
+ while (NULL != (csh_tmp = csh_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (csh_head, csh_tail, csh_tmp);
+ GNUNET_free (csh_tmp);
+ }
+ GNUNET_SERVER_notification_context_destroy (nc);
+ gns_interceptor_stop ();
+ gns_resolver_cleanup ();
+ if (NULL != statistics)
+ {
+ 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;
+ }
}
/**
- * Method called periodicattluy that triggers
- * iteration over root zone
+ * Method called periodically that triggers iteration over authoritative records
*
* @param cls closure
* @param tc task context
*/
static void
-update_zone_dht_next(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+publish_zone_dht_next (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_NAMESTORE_zone_iterator_next(namestore_iter);
+ zone_publish_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_NAMESTORE_zone_iterator_next (namestore_iter);
}
+
/**
- * Continuation for DHT put
+ * Periodically iterate over our zone and store everything in dht
*
- * @param cls closure
+ * @param cls NULL
* @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");
-}
+publish_zone_dht_start (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc);
-/* 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 signature the signature for the record data
*/
static void
-put_gns_record(void *cls,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *key,
+put_gns_record (void *cls,
+ const struct GNUNET_CRYPTO_EccPublicKey *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)
-{
-
+ const struct GNUNET_CRYPTO_EccSignature *signature)
+{
struct GNSNameRecordBlock *nrb;
- GNUNET_HashCode name_hash;
- GNUNET_HashCode xor_hash;
- struct GNUNET_CRYPTO_HashAsciiEncoded xor_hash_string;
+ 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;
- /* we're done */
if (NULL == name)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Zone iteration finished\n");
- GNUNET_NAMESTORE_zone_iteration_stop (namestore_iter);
- zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_start,
- NULL);
+ /* we're done */
+ namestore_iter = NULL;
+ last_num_public_records = num_public_records;
+ first_zone_iteration = GNUNET_NO;
+ if (0 == num_public_records)
+ {
+ /**
+ * 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");
+ }
+ else
+ {
+ 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_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_us / 1000LL,
+ 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;
}
- 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;
+ 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;
+ }
+ /* TODO 2) AB: New publishing
+ *
+ * - Use new signature S_d
+ * - Obtain new derived public key V = H(H(i,Q) * Q)
+ * - Obtain HKDF(i,Q)
+ * - Compute encrypte record block E with HKDF(i,Q) (rd, rd_count)
+ * - Create block B = |V,E,S_d|
+ * - Compute new DHT key H(V) in TODO 3)
+ *
+ * -> Put (H(V), B)
+ */
+ 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);
-
- 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;
-
+ 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_EccPublicKey),
+ &zhash);
if (-1 == GNUNET_NAMESTORE_records_serialize (rd_count,
rd,
rd_payload_length,
nrb_data))
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n");
- GNUNET_free(nrb);
+ 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;
- //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
+ /* TODO AB: Here records are put in the DHT: modify dht_key to H(key) = H(H(name,zone) * zone) */
+ 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));
- num_public_records++;
-
- /**
- * Reschedule periodic put
- */
- zone_update_taskid = GNUNET_SCHEDULER_add_delayed (dht_update_interval,
- &update_zone_dht_next,
- NULL);
-
- GNUNET_free(nrb);
-
+ 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_us / 1000LL,
+ GNUNET_NO);
+ zone_publish_task = GNUNET_SCHEDULER_add_delayed (next_put_interval,
+ &publish_zone_dht_next,
+ NULL);
}
+
/**
* Periodically iterate over our zone and store everything in dht
*
* @param tc task context
*/
static void
-update_zone_dht_start(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+publish_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);
- }
- else
- {
- dht_update_interval = GNUNET_TIME_relative_multiply(
- GNUNET_TIME_UNIT_SECONDS,
- (3600/num_public_records));
- }
- num_public_records = 0; //start counting again
+ 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,
- &zone_hash,
- GNUNET_NAMESTORE_RF_AUTHORITY,
- GNUNET_NAMESTORE_RF_PRIVATE,
- &put_gns_record,
- NULL);
+ NULL, /* All zones */
+ GNUNET_NAMESTORE_RF_AUTHORITY,
+ GNUNET_NAMESTORE_RF_PRIVATE,
+ &put_gns_record,
+ NULL);
}
/* END DHT ZONE PROPAGATION */
+
/**
* 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
- * @param csh the handle to the shorten request
*/
static void
-send_shorten_response(void* cls, const char* name)
+send_shorten_response (void* cls, const char* name)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message with %s\n",
- "SHORTEN_RESULT", name);
+ struct ClientShortenHandle *csh = cls;
struct GNUNET_GNS_ClientShortenResultMessage *rmsg;
- struct ClientShortenHandle *csh = (struct ClientShortenHandle *)cls;
+ size_t name_len;
- if (name == NULL)
- {
- name = "";
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending `%s' message with %s\n",
+ "SHORTEN_RESULT", name);
+ if (NULL == name)
+ name_len = 0;
+ else
+ name_len = strlen (name) + 1;
+ GNUNET_STATISTICS_update (statistics,
+ "Name shorten results", 1, GNUNET_NO);
- rmsg = GNUNET_malloc(sizeof(struct GNUNET_GNS_ClientShortenResultMessage)
- + strlen(name) + 1);
+ rmsg = GNUNET_malloc (sizeof (struct GNUNET_GNS_ClientShortenResultMessage) +
+ name_len);
- rmsg->id = csh->unique_id;
+ rmsg->id = csh->request_id;
rmsg->header.type = htons(GNUNET_MESSAGE_TYPE_GNS_SHORTEN_RESULT);
rmsg->header.size =
htons(sizeof(struct GNUNET_GNS_ClientShortenResultMessage) +
- strlen(name) + 1);
+ 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);
+}
- 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);
+/**
+ * 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
+ *
+ */
+static void
+process_shorten_in_private_zone_lookup (void *cls,
+ const struct GNUNET_CRYPTO_EccPublicKey *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 = 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);
+
+ 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);
+
+}
+
+
+/**
+ * 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
+process_shorten_in_root_zone_lookup (void *cls,
+ const struct GNUNET_CRYPTO_EccPublicKey *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 = cls;
+ struct GNUNET_CRYPTO_ShortHashCode *szone = &csh->shorten_zone;
+ struct GNUNET_CRYPTO_ShortHashCode *pzone = &csh->private_zone;
- GNUNET_free(rmsg);
- GNUNET_free(csh->name);
- GNUNET_free(csh);
+ 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 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);
+}
+
+
+/**
+ * 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
+process_private_in_root_zone_lookup (void *cls,
+ const struct GNUNET_CRYPTO_EccPublicKey *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 = cls;
+ csh->namestore_task = NULL;
+ if (0 == rd_count)
+ {
+ 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;
+ }
+ 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);
}
+
/**
* Handle a shorten message from the api
*
- * @param cls the closure
+ * @param cls the closure (unused)
* @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_shorten (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;
- const char* name;
-
- if (ntohs (message->size) < sizeof (struct GNUNET_GNS_ClientShortenMessage))
+ 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_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;
+ }
+ 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])
{
- GNUNET_break_op (0);
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ 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;
}
-
- GNUNET_SERVER_notification_context_add (nc, client);
-
- struct GNUNET_GNS_ClientShortenMessage *sh_msg =
- (struct GNUNET_GNS_ClientShortenMessage *) message;
-
- msg_size = ntohs(message->size);
-
- if (msg_size > GNUNET_SERVER_MAX_MESSAGE_SIZE)
+ 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_break_op (0);
+ 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 = GNUNET_malloc(sizeof(struct ClientShortenHandle));
- csh->client = client;
- csh->unique_id = sh_msg->id;
-
- name = (char*)&sh_msg[1];
- csh->name = GNUNET_malloc(strlen(name)
- - strlen(GNUNET_GNS_TLD) + 1);
- memset(csh->name, 0,
- strlen(name)-strlen(GNUNET_GNS_TLD) + 1);
- memcpy(csh->name, name,
- strlen(name)-strlen(GNUNET_GNS_TLD));
-
- /* Start shortening */
- gns_resolver_shorten_name(zone_hash, name, &send_shorten_response, csh);
+ 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);
}
/**
* Send get authority response back to client
*
- * @param name the shortened name result or NULL if cannot be shortened
- * @param cah the handle to the get authority request
+ * @param cls the closure containing a client get auth handle
+ * @param name the name of the authority, or NULL on error
*/
-static void
-send_get_auth_response(void *cls, const char* name)
+static void
+send_get_auth_response (void *cls,
+ const char* name)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message with %s\n",
- "GET_AUTH_RESULT", name);
+ struct ClientGetAuthHandle *cah = cls;
struct GNUNET_GNS_ClientGetAuthResultMessage *rmsg;
- struct ClientGetAuthHandle *cah = (struct ClientGetAuthHandle *)cls;
- if (name == NULL)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending `%s' message with `%s'\n",
+ "GET_AUTH_RESULT", name);
+ if (NULL != name)
{
- name = "";
- }
-
- rmsg = GNUNET_malloc(sizeof(struct GNUNET_GNS_ClientGetAuthResultMessage)
- + strlen(name) + 1);
+ 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->unique_id;
+ 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);
+ strlen (name) + 1);
+ strcpy ((char*)&rmsg[1], name);
GNUNET_SERVER_notification_context_unicast (nc, cah->client,
- (const struct GNUNET_MessageHeader *) rmsg,
- GNUNET_NO);
+ &rmsg->header,
+ GNUNET_NO);
GNUNET_SERVER_receive_done (cah->client, GNUNET_OK);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Cleaning up handles...\n");
-
GNUNET_free(rmsg);
- GNUNET_free(cah->name);
- GNUNET_free(cah);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "done.\n");
-
+ GNUNET_free_non_null(cah->name);
+ GNUNET_free(cah);
}
* @param client the client
* @param message the message
*/
-static void handle_get_authority(void *cls,
- struct GNUNET_SERVER_Client * client,
- const struct GNUNET_MessageHeader * message)
+static void
+handle_get_authority (void *cls,
+ struct GNUNET_SERVER_Client * client,
+ const struct GNUNET_MessageHeader * message)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "GET_AUTH");
-
- size_t msg_size = 0;
struct ClientGetAuthHandle *cah;
- const char* name;
-
- if (ntohs (message->size) < sizeof (struct GNUNET_GNS_ClientGetAuthMessage))
+ 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_op (0);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
-
GNUNET_SERVER_notification_context_add (nc, client);
-
- struct GNUNET_GNS_ClientGetAuthMessage *sh_msg =
- (struct GNUNET_GNS_ClientGetAuthMessage *) message;
-
- msg_size = ntohs(message->size);
-
- if (msg_size > GNUNET_SERVER_MAX_MESSAGE_SIZE)
+ 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_op (0);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ 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->unique_id = sh_msg->id;
+ 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;
+ }
+
+ 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;
+ }
- name = (char*)&sh_msg[1];
- 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));
+ 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 */
- gns_resolver_get_authority(zone_hash, name, &send_get_auth_response, cah);
+ gns_resolver_get_authority (zone_hash, zone_hash, name,
+ &send_get_auth_response, cah);
+ GNUNET_STATISTICS_update (statistics,
+ "Authority lookup attempts", 1, GNUNET_NO);
}
* Reply to client with the result from our lookup.
*
* @param cls the closure (our client lookup handle)
- * @param rh the request handle of the lookup
* @param rd_count the number of records
* @param rd the record data
*/
static void
-send_lookup_response(void* cls,
- uint32_t rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+send_lookup_response (void* cls,
+ uint32_t rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd)
{
- struct ClientLookupHandle* clh = (struct ClientLookupHandle*)cls;
+ struct ClientLookupHandle* clh = cls;
struct GNUNET_GNS_ClientLookupResultMessage *rmsg;
size_t len;
"LOOKUP_RESULT", rd_count);
len = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
- rmsg = GNUNET_malloc(len+sizeof(struct GNUNET_GNS_ClientLookupResultMessage));
+ rmsg = GNUNET_malloc (len + sizeof (struct GNUNET_GNS_ClientLookupResultMessage));
- rmsg->id = clh->unique_id;
+ 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(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,
GNUNET_free(rmsg);
GNUNET_free(clh->name);
- GNUNET_free(clh);
-
+
+ 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);
}
* @param message the message
*/
static void
-handle_lookup(void *cls,
- struct GNUNET_SERVER_Client * client,
- const struct GNUNET_MessageHeader * message)
+handle_lookup (void *cls,
+ struct GNUNET_SERVER_Client * client,
+ const struct GNUNET_MessageHeader * message)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "LOOKUP");
-
- size_t msg_size = 0;
+ size_t namelen;
+ char name[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
struct ClientLookupHandle *clh;
-
- if (ntohs (message->size) < sizeof (struct GNUNET_GNS_ClientLookupMessage))
+ char* nameptr = name;
+ const char *utf_in;
+ int only_cached;
+ const struct GNUNET_CRYPTO_EccPrivateKey *key;
+ 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);
-
- struct GNUNET_GNS_ClientLookupMessage *sh_msg =
- (struct GNUNET_GNS_ClientLookupMessage *) message;
+ if (GNUNET_YES == ntohl (sh_msg->have_key))
+ {
+ key = &sh_msg->shorten_key;
+ }
+ 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);
- msg_size = ntohs(message->size);
-
- if (msg_size > GNUNET_SERVER_MAX_MESSAGE_SIZE)
+ 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);
+ if (NULL != key)
{
- GNUNET_break_op (0);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ clh->shorten_key = GNUNET_new (struct GNUNET_CRYPTO_EccPrivateKey);
+ *clh->shorten_key = *key;
+ }
+ only_cached = ntohl (sh_msg->only_cached);
+
+ 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;
}
- clh = GNUNET_malloc(sizeof(struct ClientLookupHandle));
- clh->client = client;
- clh->name = GNUNET_malloc(strlen((char*)&sh_msg[1]) + 1);
- strcpy(clh->name, (char*)&sh_msg[1]);
- clh->unique_id = sh_msg->id;
- clh->type = ntohl(sh_msg->type);
+ if ((GNUNET_GNS_RECORD_A == clh->type) &&
+ (GNUNET_OK != v4_enabled))
+ {
+ 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;
+ }
+
+ if (GNUNET_NO == ntohl (sh_msg->have_zone))
+ clh->zone = zone_hash; /* Default zone */
+ else
+ clh->zone = sh_msg->zone;
- gns_resolver_lookup_record(zone_hash, clh->type, (char*)&sh_msg[1],
- &send_lookup_response, clh);
+ 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);
}
-
/**
* 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_get_authority, NULL, GNUNET_MESSAGE_TYPE_GNS_GET_AUTH, 0}
};
+ char* keyfile;
+ struct GNUNET_CRYPTO_EccPublicKey pkey;
+ unsigned long long max_parallel_bg_queries = 0;
+ int ignore_pending = GNUNET_NO;
+
+ v6_enabled = GNUNET_NETWORK_test_pf (PF_INET6);
+ v4_enabled = GNUNET_NETWORK_test_pf (PF_INET);
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (c, "gns",
- "ZONEKEY", &keyfile))
+ 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_hash);
+ 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_EccPublicKey),
+ &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");
-
- if (gns_interceptor_init(zone_hash, c) == GNUNET_SYSERR)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Failed to enable the dns interceptor!\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