#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 "gnunet-service-gns_resolver.h"
#include "gnunet-service-gns_interceptor.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_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
+
/**
* Handle to a shorten operation from api
*/
struct ClientShortenHandle
{
+
+ /* DLL */
+ struct ClientShortenHandle *next;
+
+ /* DLL */
+ struct ClientShortenHandle *prev;
+
/* the requesting client that */
struct GNUNET_SERVER_Client *client;
enum GNUNET_GNS_RecordType type;
/* name to shorten */
- char* name;
+ char name[MAX_DNS_NAME_LENGTH];
+
+ /* name of private zone (relative to root) */
+ char private_zone_id[MAX_DNS_NAME_LENGTH];
+
+ /* name of shorten zone (relative to root) */
+ char shorten_zone_id[MAX_DNS_NAME_LENGTH];
+
+ /* root zone */
+ struct GNUNET_CRYPTO_ShortHashCode root_zone;
+
+ /* private zone */
+ struct GNUNET_CRYPTO_ShortHashCode private_zone;
+
+ /* shorten zone */
+ struct GNUNET_CRYPTO_ShortHashCode shorten_zone;
+
+ /* Namestore lookup task */
+ struct GNUNET_NAMESTORE_QueueEntry *namestore_task;
};
*/
struct ClientLookupHandle
{
+
/* the requesting client that */
struct GNUNET_SERVER_Client *client;
+ /* The zone we look up in */
+ struct GNUNET_CRYPTO_ShortHashCode zone;
+
+ /* Do we only want to lookup from local cache? */
+ int only_cached;
+
/* request id */
uint64_t unique_id;
/* request type */
enum GNUNET_GNS_RecordType type;
+ /* optional zone private key used for shorten */
+ struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key;
+
/* the name to look up */
char* name; //Needed?
};
/**
* Useful for zone update for DHT put
*/
-static int num_public_records = 0;
+static unsigned long long num_public_records;
/**
- * update interval in seconds
+ * Last seen record count
*/
-static unsigned long long int max_record_put_interval;
+static unsigned long long last_num_public_records;
-static unsigned long long int dht_max_update_interval;
+static struct GNUNET_TIME_Relative zone_iteration_interval;
/* dht update interval FIXME define? */
static struct GNUNET_TIME_Relative record_put_interval;
/* 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;
+/* ipv6 support */
+static int v6_enabled;
+
+/* ipv4 support */
+static int v4_enabled;
+
+/* Shorten DLL for cancelling NS requests */
+static struct ClientShortenHandle *csh_head;
+
+/* Shorten DLL for cancelling NS requests */
+static struct ClientShortenHandle *csh_tail;
+
+/* Statistics handle */
+static struct GNUNET_STATISTICS_Handle *statistics;
+
+/**
+ * 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);
+
+
/**
* Continue shutdown
*/
static void
on_resolver_cleanup(void)
{
- GNUNET_NAMESTORE_disconnect(namestore_handle, 1);
+ if (NULL != statistics)
+ GNUNET_STATISTICS_destroy (statistics, GNUNET_NO);
+
+ if (NULL != namestore_iter)
+ GNUNET_NAMESTORE_zone_iteration_stop (namestore_iter);
+ GNUNET_NAMESTORE_disconnect(namestore_handle);
GNUNET_DHT_disconnect(dht_handle);
}
static void
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ struct ClientShortenHandle *csh_tmp = csh_head;
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);
+
+ while (csh_tmp != NULL)
+ {
+ GNUNET_CONTAINER_DLL_remove (csh_head, csh_tail, csh_tmp);
+ send_shorten_response (csh_tmp, csh_tmp->name);
+ }
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 */
+ if (zone_update_taskid != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel(zone_update_taskid);
}
static void
update_zone_dht_next(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_NAMESTORE_zone_iterator_next(namestore_iter);
+ zone_update_taskid = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_NAMESTORE_zone_iterator_next (namestore_iter);
}
/**
struct GNSNameRecordBlock *nrb;
struct GNUNET_CRYPTO_ShortHashCode name_hash;
struct GNUNET_CRYPTO_ShortHashCode zhash;
- GNUNET_HashCode xor_hash;
- GNUNET_HashCode name_hash_double;
- GNUNET_HashCode zone_hash_double;
+ struct GNUNET_HashCode xor_hash;
+ struct GNUNET_HashCode name_hash_double;
+ struct GNUNET_HashCode zone_hash_double;
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)
{
+ 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,
+ "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. Rescheduling put in %ds\n",
- dht_max_update_interval);
- zone_update_taskid = GNUNET_SCHEDULER_add_delayed (
- GNUNET_TIME_relative_multiply(
- GNUNET_TIME_UNIT_SECONDS,
- dht_max_update_interval
- ),
- &update_zone_dht_start,
- NULL);
+ "Adjusted zone iteration interval to %llus!\n",
+ zone_iteration_interval.rel_value);
+ GNUNET_STATISTICS_set (statistics,
+ "Current zone iteration interval [msec]",
+ zone_iteration_interval.rel_value,
+ GNUNET_NO);
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Zone iteration finished. Rescheduling zone iteration\n");
+
+ namestore_iter = NULL;
+ if (num_public_records == 0)
+ 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);
+ GNUNET_STATISTICS_update (statistics,
+ "Number of zone iterations", 1, GNUNET_NO);
+
+ last_num_public_records = num_public_records;
+ GNUNET_STATISTICS_set (statistics,
+ "Number of public records in DHT",
+ last_num_public_records,
+ GNUNET_NO);
return;
}
namelen = strlen(name) + 1;
+
+ if (rd_count == 0)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ "No records given for name %s! Skipping...\n",
+ name);
+ zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_next,
+ NULL);
+ return;
+ }
if (signature == NULL)
{
"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);
+ "putting %d records for %s under key: %s with size %d\n",
+ rd_count, name, GNUNET_h2s (&xor_hash), rd_payload_length);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"DHT req to %d\n", DHT_OPERATION_TIMEOUT.rel_value);
+
+ GNUNET_STATISTICS_update (statistics,
+ "Record bytes put into DHT", rd_payload_length, GNUNET_NO);
+
/* FIXME: keep return value to possibly cancel? */
GNUNET_DHT_put (dht_handle, &xor_hash,
DHT_GNS_REPLICATION_LEVEL,
- GNUNET_DHT_RO_NONE,
+ GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
rd_payload_length,
(char*)nrb,
NULL); //cls for cont
num_public_records++;
+
+ if ((num_public_records > last_num_public_records)
+ && (first_zone_iteration == GNUNET_NO))
+ {
+ zone_iteration_interval = GNUNET_TIME_relative_divide (record_put_interval,
+ num_public_records);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Last record count was lower than current record count... increasing.\n");
+ 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 [msec]",
+ next_put_interval.rel_value,
+ GNUNET_NO);
+
/**
* Reschedule periodic put
*/
- zone_update_taskid = GNUNET_SCHEDULER_add_delayed (record_put_interval,
+ zone_update_taskid = GNUNET_SCHEDULER_add_delayed (next_put_interval,
&update_zone_dht_next,
NULL);
static void
update_zone_dht_start(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ zone_update_taskid = GNUNET_SCHEDULER_NO_TASK;
+
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Scheduling DHT zone update!\n");
- unsigned long long int interval = 0;
-
- 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);
- }
-
/* start counting again */
num_public_records = 0;
namestore_iter = GNUNET_NAMESTORE_zone_iteration_start (namestore_handle,
NULL);
}
-
/* END DHT ZONE PROPAGATION */
/**
name = "";
}
+ GNUNET_STATISTICS_update (statistics,
+ "Name shorten results", 1, GNUNET_NO);
+
rmsg = GNUNET_malloc(sizeof(struct GNUNET_GNS_ClientShortenResultMessage)
+ strlen(name) + 1);
(const struct GNUNET_MessageHeader *) rmsg,
GNUNET_NO);
GNUNET_SERVER_receive_done (csh->client, GNUNET_OK);
+
+ if (NULL != csh->namestore_task)
+ GNUNET_NAMESTORE_cancel (csh->namestore_task);
GNUNET_free(rmsg);
- GNUNET_free_non_null(csh->name);
GNUNET_free(csh);
}
+
+/**
+ * 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_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;
+
+ if (0 == strcmp (csh->private_zone_id, ""))
+ pzone = NULL;
+
+ if (rd_count == 0)
+ {
+ 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,
+ "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_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;
+
+ if (0 == strcmp (csh->private_zone_id, ""))
+ pzone = NULL;
+
+ if (rd_count == 0)
+ {
+ 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_assert (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_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;
+
+ if (rd_count == 0)
+ {
+ 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_assert (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,
+ &csh->private_zone,
+ &csh->shorten_zone,
+ &process_shorten_in_private_zone_lookup,
+ csh);
+}
+
+/**
+ * Lookup the zone infos and shorten name
+ *
+ * @param csh the shorten handle
+ *
+ */
+static void
+start_shorten_name (struct ClientShortenHandle *csh)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Looking for private zone name in root zone\n");
+
+ csh->namestore_task = GNUNET_NAMESTORE_zone_to_name (namestore_handle,
+ &csh->root_zone,
+ &csh->private_zone,
+ &process_private_in_root_zone_lookup,
+ csh);
+}
+
+
/**
* Handle a shorten message from the api
*
* @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");
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);
-
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "SHORTEN: Converted %s to %s\n", (char*)&sh_msg[1], 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);
- csh->name = NULL;
+ "SHORTEN: %s is too short\n", name);
+ GNUNET_CONTAINER_DLL_remove (csh_head, csh_tail, csh);
send_shorten_response(csh, name);
return;
}
if (strlen (name) > MAX_DNS_NAME_LENGTH) {
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "SHORTEN: %s is too long", name);
- csh->name = NULL;
+ "SHORTEN: %s is too long\n", name);
+ GNUNET_CONTAINER_DLL_remove (csh_head, csh_tail, csh);
send_shorten_response(csh, name);
return;
}
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%s is not our domain. Returning\n", name);
- csh->name = NULL;
+ GNUNET_CONTAINER_DLL_remove (csh_head, csh_tail, csh);
send_shorten_response(csh, name);
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);
- /* Start shortening */
- if (GNUNET_YES == auto_import_pkey)
- gns_resolver_shorten_name(zone_hash, name, zone_key,
- &send_shorten_response, csh);
+ if (1 == ntohl(sh_msg->use_default_zone))
+ csh->root_zone = zone_hash; //Default zone
else
- gns_resolver_shorten_name(zone_hash, name, NULL,
- &send_shorten_response, csh);
+ csh->root_zone = sh_msg->zone;
+
+ start_shorten_name (csh);
+
+ GNUNET_STATISTICS_update (statistics,
+ "Name shorten attempts", 1, GNUNET_NO);
+
}
struct GNUNET_GNS_ClientGetAuthResultMessage *rmsg;
struct ClientGetAuthHandle *cah = (struct ClientGetAuthHandle *)cls;
+ if (name != NULL)
+ {
+ GNUNET_STATISTICS_update (statistics,
+ "Authorities resolved", 1, GNUNET_NO);
+ }
+
if (name == NULL)
{
name = "";
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");
-
+
+
}
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.
*
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);
+
+ if (NULL != clh->shorten_key)
+ GNUNET_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);
+ }
+
}
char name[MAX_DNS_NAME_LENGTH];
struct ClientLookupHandle *clh;
char* nameptr = name;
+ 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_SERVER_receive_done (client, GNUNET_OK);
return;
}
+
+ if (1 == ntohl(sh_msg->have_key))
+ {
+ pkey = (struct GNUNET_CRYPTO_RsaPrivateKeyBinaryEncoded *)&sh_msg[1];
+ tmp_pkey = (char*)&sh_msg[1];
+ key = GNUNET_CRYPTO_rsa_decode_key (tmp_pkey, ntohs(pkey->len));
+ GNUNET_STRINGS_utf8_tolower(&tmp_pkey[ntohs(pkey->len)], &nameptr);
+ }
+ else
+ {
+ key = NULL;
+ GNUNET_STRINGS_utf8_tolower((char*)&sh_msg[1], &nameptr);
+ }
- GNUNET_STRINGS_utf8_tolower((char*)&sh_msg[1], &nameptr);
namelen = strlen(name)+1;
- clh = GNUNET_malloc(sizeof(struct ClientLookupHandle));
+ 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->unique_id = sh_msg->id;
clh->type = ntohl(sh_msg->type);
+ clh->shorten_key = key;
+
+ only_cached = ntohl(sh_msg->only_cached);
if (strlen (name) > MAX_DNS_NAME_LENGTH) {
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
send_lookup_response(clh, 0, NULL);
return;
}
+
+ if ((clh->type == GNUNET_GNS_RECORD_A) &&
+ (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 ((clh->type == GNUNET_GNS_RECORD_AAAA) &&
+ (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 (1 == ntohl(sh_msg->use_default_zone))
+ clh->zone = zone_hash; //Default zone
+ else
+ clh->zone = sh_msg->zone;
if (GNUNET_YES == auto_import_pkey)
{
- gns_resolver_lookup_record(zone_hash, clh->type, name,
- zone_key,
- default_lookup_timeout,
- &send_lookup_response, clh);
+ 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(zone_hash, clh->type, name,
- NULL,
- default_lookup_timeout,
- &send_lookup_response, clh);
+ 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);
}
+/**
+ * Test if the given AF is supported by this system.
+ *
+ * @param af to test
+ * @return GNUNET_OK if the AF is supported
+ */
+static int
+test_af (int af)
+{
+ int s;
+ s = socket (af, SOCK_STREAM, 0);
+ if (-1 == s)
+ {
+ if (EAFNOSUPPORT == errno)
+ return GNUNET_NO;
+ 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;
{&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);
+
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!\n");
- GNUNET_SCHEDULER_shutdown(0);
+ GNUNET_SCHEDULER_shutdown ();
return;
}
//FIXME do error handling;
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
"Failed to connect to the namestore!\n");
- GNUNET_SCHEDULER_shutdown(0);
+ GNUNET_SCHEDULER_shutdown ();
return;
}
}
- 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: %d\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: %d\n",
- max_record_put_interval);
+ "Record put interval: %llu\n",
+ record_put_interval);
}
-
+
if (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_number (c, "gns",
"MAX_PARALLEL_BACKGROUND_QUERIES",
&max_parallel_bg_queries))
{
GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Number of allowed parallel background queries: %d\n",
+ "Number of allowed parallel background queries: %llu\n",
max_parallel_bg_queries);
}
&default_lookup_timeout_secs))
{
GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Default lookup timeout: %ds\n", default_lookup_timeout_secs);
+ "Default lookup timeout: %llus\n", default_lookup_timeout_secs);
default_lookup_timeout = GNUNET_TIME_relative_multiply(
GNUNET_TIME_UNIT_SECONDS,
default_lookup_timeout_secs);
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Could not connect to DHT!\n");
}
- if (gns_resolver_init(namestore_handle, dht_handle, zone_hash,
+ if (gns_resolver_init(namestore_handle, dht_handle, zone_hash, c,
max_parallel_bg_queries,
ignore_pending)
== GNUNET_SYSERR)
* 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