/*
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
#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"
-/* 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
+#define INITIAL_ZONE_ITERATION_INTERVAL GNUNET_TIME_UNIT_MILLISECONDS
+#define MINIMUM_ZONE_ITERATION_INTERVAL GNUNET_TIME_UNIT_SECONDS
+#define DEFAULT_RECORD_PUT_INTERVAL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 4)
+#define LATE_ITERATION_SPEEDUP_FACTOR 2
/**
uint64_t unique_id;
/* name to lookup authority */
- char* name;
+ char *name;
};
struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key;
/* the name to look up */
- char* name; //Needed?
+ char *name;
};
+
/**
* Our handle to the DHT
*/
/**
* Our zone's private key
*/
-struct GNUNET_CRYPTO_RsaPrivateKey *zone_key;
+static struct GNUNET_CRYPTO_RsaPrivateKey *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
*/
-struct GNUNET_CRYPTO_ShortHashCode zone_hash;
+static struct GNUNET_CRYPTO_ShortHashCode zone_hash;
/**
* Useful for zone update for DHT put
*/
-static int num_public_records;
+static unsigned long long num_public_records;
/**
- * update interval in seconds
+ * Last seen record count
*/
-static unsigned long long max_record_put_interval;
+static unsigned long long last_num_public_records;
-static unsigned long long dht_max_update_interval;
+/**
+ * FIXME!
+ */
+static struct GNUNET_TIME_Relative zone_iteration_interval;
/* dht update interval FIXME define? */
static struct GNUNET_TIME_Relative record_put_interval;
/* zone update task */
-GNUNET_SCHEDULER_TaskIdentifier zone_update_taskid = GNUNET_SCHEDULER_NO_TASK;
+static GNUNET_SCHEDULER_TaskIdentifier zone_update_taskid;
/* automatic pkey import for name shortening */
static int auto_import_pkey;
+/* first zone iteration is specia */
+static int first_zone_iteration;
+
/* lookup timeout */
static struct GNUNET_TIME_Relative default_lookup_timeout;
/* Shorten DLL for cancelling NS requests */
static struct ClientShortenHandle *csh_tail;
-/**
- * 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
-send_shorten_response(void* cls, const char* name);
-
+/* Statistics handle */
+static struct GNUNET_STATISTICS_Handle *statistics;
-/**
- * Continue shutdown
- */
-static void
-on_resolver_cleanup(void)
-{
- if (NULL != namestore_iter)
- GNUNET_NAMESTORE_zone_iteration_stop (namestore_iter);
- GNUNET_NAMESTORE_disconnect(namestore_handle);
- GNUNET_DHT_disconnect(dht_handle);
-}
/**
* Task run during shutdown.
static void
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct ClientShortenHandle *csh_tmp = csh_head;
+ struct ClientShortenHandle *csh_tmp;
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"Shutting down!");
-
- while (csh_tmp != NULL)
+ while (NULL != (csh_tmp = csh_head))
{
GNUNET_CONTAINER_DLL_remove (csh_head, csh_tail, csh_tmp);
- send_shorten_response (csh_tmp, csh_tmp->name);
+ GNUNET_free(csh_tmp);
}
-
- GNUNET_SERVER_notification_context_destroy (nc);
-
- gns_interceptor_stop();
- gns_resolver_cleanup(&on_resolver_cleanup);
- /* Kill zone task for it may make the scheduler hang */
+ GNUNET_SERVER_notification_context_destroy (nc);
+ gns_interceptor_stop ();
+ gns_resolver_cleanup ();
+ if (NULL != statistics)
+ GNUNET_STATISTICS_destroy (statistics, GNUNET_NO);
if (zone_update_taskid != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel(zone_update_taskid);
+ GNUNET_SCHEDULER_cancel (zone_update_taskid);
+ if (NULL != namestore_iter)
+ GNUNET_NAMESTORE_zone_iteration_stop (namestore_iter);
+ GNUNET_NAMESTORE_disconnect(namestore_handle);
+ GNUNET_DHT_disconnect(dht_handle);
}
/**
- * 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)
+update_zone_dht_next (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
zone_update_taskid = GNUNET_SCHEDULER_NO_TASK;
GNUNET_NAMESTORE_zone_iterator_next (namestore_iter);
}
+
/**
* Continuation for DHT put
*
static void
record_dht_put(void *cls, int success)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "put request transmitted\n");
+ 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.
*
unsigned int rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd,
const struct GNUNET_CRYPTO_RsaSignature *signature)
-{
-
+{
struct GNSNameRecordBlock *nrb;
- struct GNUNET_CRYPTO_ShortHashCode name_hash;
struct GNUNET_CRYPTO_ShortHashCode zhash;
- struct GNUNET_HashCode xor_hash;
- struct GNUNET_HashCode name_hash_double;
- struct GNUNET_HashCode zone_hash_double;
+ 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. Rescheduling put in %ds\n",
- dht_max_update_interval);
+ /* we're done */
namestore_iter = NULL;
- zone_update_taskid = GNUNET_SCHEDULER_add_delayed (
- GNUNET_TIME_relative_multiply(
- GNUNET_TIME_UNIT_SECONDS,
- dht_max_update_interval
- ),
- &update_zone_dht_start,
- 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
+ */
+ zone_iteration_interval = GNUNET_TIME_relative_divide (record_put_interval,
+ 1);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
+ "No records in db.\n");
+ }
+ else
+ {
+ zone_iteration_interval = GNUNET_TIME_relative_divide (record_put_interval,
+ num_public_records);
+ }
+ zone_iteration_interval = GNUNET_TIME_relative_max (MINIMUM_ZONE_ITERATION_INTERVAL,
+ zone_iteration_interval);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Zone iteration finished. Adjusted zone iteration interval to %s\n",
+ GNUNET_STRINGS_relative_time_to_string (zone_iteration_interval, GNUNET_YES));
+ GNUNET_STATISTICS_set (statistics,
+ "Current zone iteration interval (in ms)",
+ zone_iteration_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_update_taskid = GNUNET_SCHEDULER_add_delayed (zone_iteration_interval,
+ &update_zone_dht_start,
+ NULL);
+ else
+ zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_start, NULL);
return;
}
- namelen = strlen(name) + 1;
-
- if (signature == NULL)
+ namelen = strlen (name) + 1;
+ if (0 == rd_count)
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "No signature for %s record data provided! Skipping...\n",
- name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "No records for name `%s'! Skipping.\n",
+ name);
+ zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_next,
+ NULL);
+ return;
+ }
+ if (NULL == signature)
+ {
+ GNUNET_break (0);
zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_next,
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 + namelen
- + sizeof(struct GNSNameRecordBlock));
-
+ 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->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_RsaPublicKeyBinaryEncoded),
+ &zhash);
if (-1 == GNUNET_NAMESTORE_records_serialize (rd_count,
rd,
rd_payload_length,
nrb_data))
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Record serialization failed! Skipping...\n");
+ 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_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_next,
NULL);
return;
}
-
- /*
- * calculate DHT key: H(name) xor H(pubkey)
- */
- GNUNET_CRYPTO_short_hash(key,
- sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &zhash);
- GNUNET_CRYPTO_short_hash(name, strlen(name), &name_hash);
- GNUNET_CRYPTO_short_hash_double (&name_hash, &name_hash_double);
- GNUNET_CRYPTO_short_hash_double (&zhash, &zone_hash_double);
- GNUNET_CRYPTO_hash_xor(&zone_hash_double, &name_hash_double, &xor_hash);
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "zone identity: %s\n", GNUNET_h2s (&zone_hash_double));
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "putting records for %s under key: %s with size %d\n",
- name, GNUNET_h2s (&xor_hash), rd_payload_length);
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "DHT req to %d\n", DHT_OPERATION_TIMEOUT.rel_value);
- /* FIXME: keep return value to possibly cancel? */
- 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
+ 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 (record_put_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,
+ &record_dht_put,
+ 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");
+ zone_iteration_interval = GNUNET_TIME_relative_divide (record_put_interval,
+ num_public_records);
+ next_put_interval = GNUNET_TIME_relative_divide (zone_iteration_interval,
+ LATE_ITERATION_SPEEDUP_FACTOR);
+ }
+ else
+ next_put_interval = zone_iteration_interval;
+
+ GNUNET_STATISTICS_set (statistics,
+ "Current zone iteration interval (ms)",
+ next_put_interval.rel_value,
+ GNUNET_NO);
+ zone_update_taskid = GNUNET_SCHEDULER_add_delayed (next_put_interval,
+ &update_zone_dht_next,
+ NULL);
}
+
/**
* Periodically iterate over our zone and store everything in dht
*
static void
update_zone_dht_start(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- unsigned long long interval = 0;
-
zone_update_taskid = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Scheduling DHT zone update!\n");
- if (0 == num_public_records)
- {
- /**
- * If no records are known (startup) or none present
- * we can safely set the interval to 1s
- */
- record_put_interval = GNUNET_TIME_relative_multiply(
- GNUNET_TIME_UNIT_SECONDS,
- 1);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "No records in db. Adjusted record put interval to 1s\n");
- }
- else
- {
- interval = max_record_put_interval/num_public_records;
- if (interval == 0)
- interval = 1;
- record_put_interval = GNUNET_TIME_relative_multiply(
- GNUNET_TIME_UNIT_SECONDS,
- interval);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Adjusted DHT update interval to %ds!\n",
- interval);
- }
-
+ 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);
+ 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 name the shortened name result or NULL if cannot be shortened
*/
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->header.type = htons(GNUNET_MESSAGE_TYPE_GNS_SHORTEN_RESULT);
rmsg->header.size =
htons(sizeof(struct GNUNET_GNS_ClientShortenResultMessage) +
- strlen(name) + 1);
-
- strcpy((char*)&rmsg[1], name);
-
+ name_len);
+ memcpy (&rmsg[1], name, name_len);
GNUNET_SERVER_notification_context_unicast (nc, csh->client,
- (const struct GNUNET_MessageHeader *) rmsg,
- GNUNET_NO);
- GNUNET_SERVER_receive_done (csh->client, GNUNET_OK);
-
+ &rmsg->header,
+ GNUNET_NO);
if (NULL != csh->namestore_task)
- GNUNET_NAMESTORE_cancel (csh->namestore_task);
-
- GNUNET_free(rmsg);
- GNUNET_free(csh);
-
+ GNUNET_NAMESTORE_cancel (csh->namestore_task);
+ GNUNET_free (rmsg);
+ GNUNET_free (csh);
}
/**
* Lookup the zone infos and shorten name
*
- * @param csh the shorten handle
+ * @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_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)
+ 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 ClientShortenHandle *csh = cls;
- csh->namestore_task = NULL;
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;
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"No shorten zone in private zone!\n");
-
strcpy (csh->shorten_zone_id, "");
szone = NULL;
-
}
else
{
-
GNUNET_assert (rd_count == 1);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
/**
* Lookup the zone infos and shorten name
*
- * @param csh the shorten handle
+ * @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
const struct GNUNET_CRYPTO_RsaSignature *signature)
{
struct ClientShortenHandle *csh = cls;
- csh->namestore_task = NULL;
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;
/**
* Lookup the zone infos and shorten name
*
- * @param csh the shorten handle
+ * @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
csh);
}
+
/**
* Lookup the zone infos and shorten name
*
/**
* 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;
+ uint16_t msg_size;
+ const struct GNUNET_GNS_ClientShortenMessage *sh_msg;
struct ClientShortenHandle *csh;
+ const char *utf_in;
char name[MAX_DNS_NAME_LENGTH];
char* nameptr = name;
- if (ntohs (message->size) < sizeof (struct GNUNET_GNS_ClientShortenMessage))
+ 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_op (0);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
-
-
- struct GNUNET_GNS_ClientShortenMessage *sh_msg =
- (struct GNUNET_GNS_ClientShortenMessage *) message;
-
- msg_size = ntohs(message->size);
-
- if (msg_size > GNUNET_SERVER_MAX_MESSAGE_SIZE)
+ 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_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
-
- csh = GNUNET_malloc(sizeof(struct ClientShortenHandle));
+ csh = GNUNET_malloc (sizeof (struct ClientShortenHandle));
csh->client = client;
csh->unique_id = sh_msg->id;
-
- GNUNET_CONTAINER_DLL_insert (csh_head, csh_tail, csh);
-
- GNUNET_STRINGS_utf8_tolower((char*)&sh_msg[1], &nameptr);
-
- if (strlen (name) < strlen(GNUNET_GNS_TLD)) {
+ 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", name);
+ "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) > MAX_DNS_NAME_LENGTH) {
+ if (strlen (name) > MAX_DNS_NAME_LENGTH)
+ {
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "SHORTEN: %s is too long", name);
+ "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_gnunet_tld(name) && !is_zkey_tld(name))
+ }
+ if ( (! is_gnunet_tld (name)) &&
+ (! is_zkey_tld (name)) )
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%s is not our domain. Returning\n", name);
- send_shorten_response(csh, 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);
-
- GNUNET_SERVER_notification_context_add (nc, client);
-
+ 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;
-
start_shorten_name (csh);
-
+ GNUNET_STATISTICS_update (statistics,
+ "Name shorten attempts", 1, GNUNET_NO);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
* @param cls the closure containing a client get auth handle
* @param name the shortened name result or NULL if cannot be shortened
*/
-static void
+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 (name != NULL)
{
- name = "";
- }
+ GNUNET_STATISTICS_update (statistics,
+ "Authorities resolved", 1, GNUNET_NO);
+ }
+ if (name == NULL)
+ name = "";
rmsg = GNUNET_malloc(sizeof(struct GNUNET_GNS_ClientGetAuthResultMessage)
+ strlen(name) + 1);
rmsg->header.size =
htons(sizeof(struct GNUNET_GNS_ClientGetAuthResultMessage) +
strlen(name) + 1);
-
- strcpy((char*)&rmsg[1], name);
+ 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_non_null(cah->name);
- GNUNET_free(cah);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "done.\n");
-
+ 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;
+ uint16_t msg_size;
+ const struct GNUNET_GNS_ClientGetAuthMessage *sh_msg;
struct ClientGetAuthHandle *cah;
+ const char *utf_in;
char name[MAX_DNS_NAME_LENGTH];
char* nameptr = name;
-
- if (ntohs (message->size) < sizeof (struct GNUNET_GNS_ClientGetAuthMessage))
+ 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_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
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((char*)&sh_msg[1], &nameptr);
-
-
+ }
+ GNUNET_STRINGS_utf8_tolower(utf_in, &nameptr);
cah = GNUNET_malloc(sizeof(struct ClientGetAuthHandle));
cah->client = client;
cah->unique_id = sh_msg->id;
-
- if (strlen(name) < strlen(GNUNET_GNS_TLD))
+ if (strlen (name) < strlen(GNUNET_GNS_TLD))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GET_AUTH: %s is too short. Returning\n", name);
+ "GET_AUTH: `%s' is too short. Returning\n", name);
cah->name = NULL;
send_get_auth_response(cah, name);
return;
- }
-
- if (strlen (name) > MAX_DNS_NAME_LENGTH) {
+ }
+ if (strlen (name) > MAX_DNS_NAME_LENGTH)
+ {
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GET_AUTH: %s is too long", name);
+ "GET_AUTH: `%s' is too long", name);
cah->name = NULL;
send_get_auth_response(cah, name);
return;
- }
-
- if (strcmp(name+strlen(name)-strlen(GNUNET_GNS_TLD),
- GNUNET_GNS_TLD) != 0)
+ }
+ 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);
return;
}
- if (strcmp(name, GNUNET_GNS_TLD) == 0)
+ 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;
- }
-
- 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);
+ memset (cah->name, 0,
+ strlen (name) - strlen (GNUNET_GNS_TLD) + 1);
+ memcpy (cah->name, name,
+ strlen (name) - strlen(GNUNET_GNS_TLD));
/* Start delegation resolution in our namestore */
gns_resolver_get_authority(zone_hash, zone_hash, name, &send_get_auth_response, cah);
+
+ GNUNET_STATISTICS_update (statistics,
+ "Authority lookup attempts", 1, GNUNET_NO);
}
GNUNET_free(clh->name);
if (NULL != clh->shorten_key)
- GNUNET_free(clh->shorten_key);
+ GNUNET_CRYPTO_rsa_key_free (clh->shorten_key);
GNUNET_free(clh);
+ GNUNET_STATISTICS_update (statistics,
+ "Completed lookups", 1, GNUNET_NO);
+
+ if (rd != NULL)
+ {
+ GNUNET_STATISTICS_update (statistics,
+ "Records resolved", rd_count, GNUNET_NO);
+ }
+
}
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;
+ uint16_t msg_size;
+ const struct GNUNET_GNS_ClientLookupMessage *sh_msg;
size_t namelen;
char name[MAX_DNS_NAME_LENGTH];
struct ClientLookupHandle *clh;
char* nameptr = name;
+ const char *utf_in;
int only_cached;
struct GNUNET_CRYPTO_RsaPrivateKey *key;
struct GNUNET_CRYPTO_RsaPrivateKeyBinaryEncoded *pkey;
char* tmp_pkey;
- if (ntohs (message->size) < sizeof (struct GNUNET_GNS_ClientLookupMessage))
- {
- GNUNET_break_op (0);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- return;
- }
-
- GNUNET_SERVER_notification_context_add (nc, client);
-
- struct GNUNET_GNS_ClientLookupMessage *sh_msg =
- (struct GNUNET_GNS_ClientLookupMessage *) message;
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "LOOKUP");
msg_size = ntohs(message->size);
-
- if (msg_size > GNUNET_SERVER_MAX_MESSAGE_SIZE)
+ if (msg_size < sizeof (struct GNUNET_GNS_ClientLookupMessage))
{
- GNUNET_break_op (0);
+ GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
-
- if (1 == ntohl(sh_msg->have_key))
+ 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_RsaPrivateKeyBinaryEncoded *)&sh_msg[1];
tmp_pkey = (char*)&sh_msg[1];
else
{
key = NULL;
- GNUNET_STRINGS_utf8_tolower((char*)&sh_msg[1], &nameptr);
- }
-
- namelen = strlen(name)+1;
+ 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;
only_cached,
&send_lookup_response, clh);
}
+
+ GNUNET_STATISTICS_update (statistics,
+ "Record lookup attempts", 1, GNUNET_NO);
}
+
/**
* Test if the given AF is supported by this system.
*
fprintf (stderr, "Failed to create test socket: %s\n", STRERROR (errno));
return GNUNET_SYSERR;
}
+#if WINDOWS
+ closesocket (s);
+#else
close (s);
+#endif
return GNUNET_OK;
}
+
/**
* Process GNS requests.
*
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;
unsigned long long max_parallel_bg_queries = 0;
{&handle_get_authority, NULL, GNUNET_MESSAGE_TYPE_GNS_GET_AUTH, 0}
};
- GNS_cfg = c;
-
v6_enabled = test_af (AF_INET6);
v4_enabled = test_af (AF_INET);
sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
&zone_hash);
GNUNET_free(keyfile);
-
- /**
- * handle to our local namestore
- */
- namestore_handle = GNUNET_NAMESTORE_connect(c);
-
+ namestore_handle = GNUNET_NAMESTORE_connect (c);
if (NULL == namestore_handle)
{
- //FIXME do error handling;
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Failed to connect to the namestore!\n");
+ 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",
"AUTO_IMPORT_PKEY"))
}
- dht_max_update_interval = GNUNET_GNS_DHT_MAX_UPDATE_INTERVAL;
+ zone_iteration_interval = INITIAL_ZONE_ITERATION_INTERVAL;
- if (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_number (c, "gns",
- "ZONE_PUT_INTERVAL",
- &dht_max_update_interval))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "DHT zone update interval: %llu\n",
- dht_max_update_interval);
- }
-
- max_record_put_interval = 1;
+ record_put_interval = DEFAULT_RECORD_PUT_INTERVAL;
if (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_number (c, "gns",
+ GNUNET_CONFIGURATION_get_value_time (c, "gns",
"RECORD_PUT_INTERVAL",
- &max_record_put_interval))
+ &record_put_interval))
{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Record put interval: %llu\n",
- max_record_put_interval);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Record put interval: %s\n",
+ GNUNET_STRINGS_relative_time_to_string (record_put_interval, GNUNET_YES));
}
-
+
if (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_number (c, "gns",
"MAX_PARALLEL_BACKGROUND_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");
}
if (gns_resolver_init(namestore_handle, dht_handle, zone_hash, c,
* for our records
* We have roughly an hour for all records;
*/
- record_put_interval = GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS,
- 1);
+ first_zone_iteration = GNUNET_YES;
zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_start, NULL);
GNUNET_SERVER_add_handlers (server, handlers);
// &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,
projects / oweals / gnunet.git / blobdiff