/*
This file is part of GNUnet.
- (C) 2009, 2010, 2011, 2012 Christian Grothoff (and other contributing authors)
+ (C) 2011-2013 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
*/
/**
* @file gns/gnunet-service-gns.c
- * @brief GNUnet GNS service
+ * @brief GNU Name System (main service)
* @author Martin Schanzenbach
+ * @author Christian Grothoff
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_transport_service.h"
#include "gnunet_dns_service.h"
#include "gnunet_dnsparser_lib.h"
#include "gnunet_dht_service.h"
#include "gnunet_gns_service.h"
#include "gnunet_statistics_service.h"
#include "gns.h"
-#include "gns_common.h"
#include "gnunet-service-gns_resolver.h"
+#include "gnunet-service-gns_shorten.h"
#include "gnunet-service-gns_interceptor.h"
#include "gnunet_protocols.h"
/**
* The default put interval for the zone iteration. In case
- * No option is found
+ * no option is found
*/
#define DEFAULT_ZONE_PUBLISH_TIME_WINDOW GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 4)
*/
#define LATE_ITERATION_SPEEDUP_FACTOR 2
+/**
+ * How long until a DHT PUT attempt should time out?
+ */
+#define DHT_OPERATION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+
+/**
+ * What replication level do we use for DHT PUT operations?
+ */
+#define DHT_GNS_REPLICATION_LEVEL 5
+
/**
* Handle to a lookup operation from api
{
/**
- * Handle to the requesting client
+ * We keep these in a DLL.
*/
- struct GNUNET_SERVER_Client *client;
+ struct ClientLookupHandle *next;
/**
- * optional zone private key used for shorten
+ * We keep these in a DLL.
*/
- struct GNUNET_CRYPTO_EccPrivateKey *shorten_key;
+ struct ClientLookupHandle *prev;
/**
- * the name to look up
+ * Handle to the requesting client
*/
- char *name;
+ struct GNUNET_SERVER_Client *client;
/**
- * The zone we look up in
+ * Active handle for the lookup.
*/
- struct GNUNET_CRYPTO_ShortHashCode zone;
+ struct GNS_ResolverHandle *lookup;
/**
- * request id
+ * request id
*/
uint32_t request_id;
- /**
- * GNUNET_YES if we only want to lookup from local cache
- */
- int only_cached;
-
- /**
- * request type
- */
- int type;
};
static struct GNUNET_DHT_Handle *dht_handle;
/**
- * Our zone's private key
+ * Active DHT put operation (or NULL)
*/
-static struct GNUNET_CRYPTO_EccPrivateKey *zone_key;
+static struct GNUNET_DHT_PutHandle *active_put;
/**
* Our handle to the namestore service
static struct GNUNET_SERVER_NotificationContext *nc;
/**
- * Our zone hash
+ * Head of the DLL.
*/
-static struct GNUNET_CRYPTO_ShortHashCode zone_hash;
+static struct ClientLookupHandle *clh_head;
+
+/**
+ * Tail of the DLL.
+ */
+static struct ClientLookupHandle *clh_tail;
/**
* Useful for zone update for DHT put
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
+ * #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
+ * #GNUNET_YES if ipv6 is supported
*/
static int v6_enabled;
/**
- * GNUNET_YES if ipv4 is supported
+ * #GNUNET_YES if ipv4 is supported
*/
static int v4_enabled;
static void
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct ClientShortenHandle *csh_tmp;
+ struct ClientLookupHandle *clh;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Shutting down!\n");
- GNUNET_SERVER_notification_context_destroy (nc);
- gns_interceptor_stop ();
- gns_resolver_cleanup ();
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Shutting down!\n");
+ GNUNET_SERVER_notification_context_destroy (nc);
+ while (NULL != (clh = clh_head))
+ {
+ GNUNET_SERVER_client_set_user_context (clh->client, NULL);
+ GNS_resolver_lookup_cancel (clh->lookup);
+ GNUNET_CONTAINER_DLL_remove (clh_head, clh_tail, clh);
+ GNUNET_free (clh);
+ }
+
+ GNS_interceptor_done ();
+ GNS_resolver_done ();
+ GNS_shorten_done ();
if (NULL != statistics)
{
GNUNET_STATISTICS_destroy (statistics, GNUNET_NO);
GNUNET_NAMESTORE_disconnect (namestore_handle);
namestore_handle = NULL;
}
+ if (NULL != active_put)
+ {
+ GNUNET_DHT_put_cancel (active_put);
+ active_put = NULL;
+ }
if (NULL != dht_handle)
{
GNUNET_DHT_disconnect (dht_handle);
* @param tc task context
*/
static void
-publish_zone_dht_start (void *cls,
+publish_zone_dht_start (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc);
+/**
+ * Continuation called from DHT once the PUT operation is done.
+ *
+ * @param cls closure, NULL
+ * @param success #GNUNET_OK on success
+ */
+static void
+dht_put_continuation (void *cls,
+ int success)
+{
+ struct GNUNET_TIME_Relative next_put_interval;
+
+ active_put = NULL;
+ 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);
+}
+
+
/**
* 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 key the private key of the authority (ours)
+ * @param name the name of the records, NULL once the iteration is done
+ * @param rd_count the number of records in @a rd
* @param rd the record data
- * @param signature the signature for the record data
*/
static void
put_gns_record (void *cls,
- const struct GNUNET_CRYPTO_EccPublicKey *key,
- struct GNUNET_TIME_Absolute expiration,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
const char *name,
unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_EccSignature *signature)
-{
- struct GNSNameRecordBlock *nrb;
- 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;
+ const struct GNUNET_NAMESTORE_RecordData *rd)
+{
+ struct GNUNET_NAMESTORE_Block *block;
+ struct GNUNET_HashCode query;
+ struct GNUNET_TIME_Absolute expire;
+ struct GNUNET_TIME_Absolute now;
+ size_t block_size;
+ struct GNUNET_NAMESTORE_RecordData rd_public[rd_count];
+ unsigned int rd_public_count;
+ unsigned int i;
if (NULL == name)
{
- /* we're done */
+ /* we're done with one iteration, calculate when to do the next one */
namestore_iter = NULL;
last_num_public_records = num_public_records;
first_zone_iteration = GNUNET_NO;
*/
put_interval = zone_publish_time_window;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
- "No records in db.\n");
+ "No records in namestore database.\n");
}
else
{
put_interval.rel_value_us / 1000LL,
GNUNET_NO);
GNUNET_STATISTICS_update (statistics,
- "Number of zone iterations", 1, GNUNET_NO);
+ "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);
+ &publish_zone_dht_start,
+ NULL);
else
- zone_publish_task = GNUNET_SCHEDULER_add_now (&publish_zone_dht_start, NULL);
+ zone_publish_task = GNUNET_SCHEDULER_add_now (&publish_zone_dht_start,
+ NULL);
return;
}
-
- namelen = strlen (name) + 1;
- if (0 == rd_count)
+
+ /* filter out records that are not public, and convert to
+ absolute expiration time. */
+ rd_public_count = 0;
+ now = GNUNET_TIME_absolute_get ();
+ for (i=0;i<rd_count;i++)
+ if (0 == (rd[i].flags & (GNUNET_NAMESTORE_RF_PRIVATE |
+ GNUNET_NAMESTORE_RF_PENDING)))
+ {
+ rd_public[rd_public_count] = rd[i];
+ if (0 != (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION))
+ {
+ rd_public[rd_public_count].flags &= ~GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION;
+ rd_public[rd_public_count].expiration_time += now.abs_value_us;
+ }
+ rd_public_count++;
+ }
+
+ /* We got a set of records to publish */
+ if (0 == rd_public_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)
+ expire = GNUNET_NAMESTORE_record_get_expiration_time (rd_public_count,
+ rd_public);
+ block = GNUNET_NAMESTORE_block_create (key,
+ expire,
+ name,
+ rd_public,
+ rd_public_count);
+ block_size = ntohl (block->purpose.size)
+ + sizeof (struct GNUNET_CRYPTO_EcdsaSignature)
+ + sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
+ GNUNET_NAMESTORE_query_from_private_key (key,
+ name,
+ &query);
+
+ active_put = GNUNET_DHT_put (dht_handle, &query,
+ DHT_GNS_REPLICATION_LEVEL,
+ GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
+ GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
+ block_size,
+ block,
+ expire,
+ DHT_OPERATION_TIMEOUT,
+ &dht_put_continuation,
+ NULL);
+ if (NULL == active_put)
{
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);
- 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,
- _("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;
- }
- /* 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));
-
- 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);
+ dht_put_continuation (NULL, GNUNET_NO);
}
- 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);
+ GNUNET_free (block);
}
* @param tc task context
*/
static void
-publish_zone_dht_start (void *cls,
+publish_zone_dht_start (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
zone_publish_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Scheduling DHT zone update!\n");
+ 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);
}
* 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_count the number of records in @a rd
* @param rd the record data
*/
static void
uint32_t rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd)
{
- struct ClientLookupHandle* clh = cls;
+ struct ClientLookupHandle *clh = cls;
struct GNUNET_GNS_ClientLookupResultMessage *rmsg;
size_t len;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message with %d results\n",
- "LOOKUP_RESULT", rd_count);
-
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending `%s' message with %d results\n",
+ "LOOKUP_RESULT",
+ rd_count);
+
len = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
rmsg = GNUNET_malloc (len + sizeof (struct GNUNET_GNS_ClientLookupResultMessage));
-
+ rmsg->header.type = htons (GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT);
+ rmsg->header.size = htons (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(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(rmsg);
- GNUNET_free(clh->name);
-
- if (NULL != clh->shorten_key)
- GNUNET_CRYPTO_ecc_key_free (clh->shorten_key);
+ rmsg->rd_count = htonl (rd_count);
+ GNUNET_NAMESTORE_records_serialize (rd_count, rd, len,
+ (char*) &rmsg[1]);
+ GNUNET_SERVER_notification_context_unicast (nc,
+ clh->client,
+ &rmsg->header,
+ GNUNET_NO);
+ GNUNET_free (rmsg);
+ GNUNET_CONTAINER_DLL_remove (clh_head, clh_tail, clh);
+ GNUNET_SERVER_client_set_user_context (clh->client, NULL);
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);
+ "Completed lookups", 1,
+ GNUNET_NO);
+ GNUNET_STATISTICS_update (statistics,
+ "Records resolved",
+ rd_count,
+ GNUNET_NO);
}
*/
static void
handle_lookup (void *cls,
- struct GNUNET_SERVER_Client * client,
- const struct GNUNET_MessageHeader * message)
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
- size_t namelen;
- char name[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
+ char name[GNUNET_DNSPARSER_MAX_NAME_LENGTH + 1];
struct ClientLookupHandle *clh;
- char* nameptr = name;
+ char *nameptr = name;
const char *utf_in;
- int only_cached;
- const struct GNUNET_CRYPTO_EccPrivateKey *key;
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *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);
+
+ 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 (0);
}
sh_msg = (const struct GNUNET_GNS_ClientLookupMessage *) message;
GNUNET_SERVER_notification_context_add (nc, client);
- if (GNUNET_YES == ntohl (sh_msg->have_key))
- {
+ if (GNUNET_YES == ntohs (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])
+ if ( ('\0' != utf_in[msg_size - sizeof (struct GNUNET_GNS_ClientLookupMessage) - 1]) ||
+ (strlen (utf_in) > GNUNET_DNSPARSER_MAX_NAME_LENGTH) )
{
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));
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+
+ clh = GNUNET_new (struct ClientLookupHandle);
+ GNUNET_SERVER_client_set_user_context (client, clh);
+ GNUNET_CONTAINER_DLL_insert (clh_head, clh_tail, clh);
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)
+ if ( (GNUNET_DNSPARSER_TYPE_A == ntohl (sh_msg->type)) &&
+ (GNUNET_OK != v4_enabled) )
{
- 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;
+ "LOOKUP: Query for A record but AF_INET not supported!");
send_lookup_response (clh, 0, NULL);
return;
}
-
- if ((GNUNET_DNSPARSER_TYPE_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_DNSPARSER_TYPE_AAAA == clh->type) &&
- (GNUNET_OK != v6_enabled))
+ if ( (GNUNET_DNSPARSER_TYPE_AAAA == ntohl (sh_msg->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;
-
- 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);
- }
+ clh->lookup = GNS_resolver_lookup (&sh_msg->zone,
+ ntohl (sh_msg->type),
+ name,
+ key,
+ ntohl (sh_msg->only_cached),
+ &send_lookup_response, clh);
GNUNET_STATISTICS_update (statistics,
- "Record lookup attempts", 1, GNUNET_NO);
+ "Lookup attempts",
+ 1, GNUNET_NO);
+}
+
+
+/**
+ * One of our clients disconnected, clean up after it.
+ *
+ * @param cls NULL
+ * @param client the client that disconnected
+ */
+static void
+notify_client_disconnect (void *cls,
+ struct GNUNET_SERVER_Client *client)
+{
+ struct ClientLookupHandle *clh;
+
+ if (NULL == client)
+ return;
+ clh = GNUNET_SERVER_client_get_user_context (client, struct ClientLookupHandle);
+ if (NULL == clh)
+ return;
+ GNS_resolver_lookup_cancel (clh->lookup);
+ GNUNET_CONTAINER_DLL_remove (clh_head, clh_tail, clh);
+ GNUNET_free (clh);
}
{ &handle_lookup, NULL, GNUNET_MESSAGE_TYPE_GNS_LOOKUP, 0},
{NULL, NULL, 0, 0}
};
- struct GNUNET_CRYPTO_EccPublicKey pkey;
+ struct GNUNET_CRYPTO_EcdsaPublicKey dns_root;
unsigned long long max_parallel_bg_queries = 0;
- int ignore_pending = GNUNET_NO;
+ char *dns_root_name;
v6_enabled = GNUNET_NETWORK_test_pf (PF_INET6);
v4_enabled = GNUNET_NETWORK_test_pf (PF_INET);
GNUNET_SCHEDULER_shutdown ();
return;
}
-
- auto_import_pkey = GNUNET_NO;
- if (GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_yesno (c, "gns",
- "AUTO_IMPORT_PKEY"))
- {
- 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;
max_parallel_bg_queries);
}
- 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 (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_time (c, "gns",
- "DEFAULT_LOOKUP_TIMEOUT",
- &default_lookup_timeout))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Default lookup timeout: %s\n",
- GNUNET_STRINGS_relative_time_to_string (default_lookup_timeout,
- GNUNET_YES));
- }
-
dht_handle = GNUNET_DHT_connect (c,
(unsigned int) max_parallel_bg_queries);
if (NULL == dht_handle)
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;
- }
- if (GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_yesno (c, "gns", "HIJACK_DNS"))
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (c, "gns", "DNS_ROOT",
+ &dns_root_name))
{
+ if (GNUNET_OK !=
+ GNUNET_CRYPTO_ecdsa_public_key_from_string (dns_root_name,
+ strlen (dns_root_name),
+ &dns_root))
+ {
+ GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+ "gns", "DNS_ROOT",
+ _("valid public key required"));
+ GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ GNUNET_free (dns_root_name);
+ return;
+ }
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "DNS hijacking enabled. Connecting to DNS service.\n");
-
+ "DNS hijacking with root `%s' enabled. Connecting to DNS service.\n",
+ dns_root_name);
+ GNUNET_free (dns_root_name);
if (GNUNET_SYSERR ==
- gns_interceptor_init (zone_hash, zone_key, c))
+ GNS_interceptor_init (&dns_root, c))
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Failed to enable the DNS interceptor!\n");
+ GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ return;
}
}
-
- /**
- * Schedule periodic put for our records We have roughly an hour for
- * all records;
- */
+ GNS_resolver_init (namestore_handle, dht_handle,
+ c,
+ max_parallel_bg_queries);
+ GNS_shorten_init (namestore_handle, dht_handle);
+ GNUNET_SERVER_disconnect_notify (server,
+ ¬ify_client_disconnect,
+ NULL);
+ /* Schedule periodic put for our records. */
first_zone_iteration = GNUNET_YES;
- zone_publish_task = GNUNET_SCHEDULER_add_now (&publish_zone_dht_start, NULL);
GNUNET_SERVER_add_handlers (server, handlers);
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);
+ zone_publish_task = GNUNET_SCHEDULER_add_now (&publish_zone_dht_start,
+ NULL);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &shutdown_task, NULL);
}