/*
This file is part of GNUnet.
- (C) 2009, 2010, 2011 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_resolver.c
* @brief GNUnet GNS resolver logic
* @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_dnsstub_lib.h"
#include "gnunet_dht_service.h"
#include "gnunet_namestore_service.h"
-#include "gnunet_vpn_service.h"
#include "gnunet_dns_service.h"
#include "gnunet_resolver_service.h"
#include "gnunet_dnsparser_lib.h"
-#include "../dns/dnsparser.h"
+#include "gns_protocol.h"
#include "gnunet_gns_service.h"
-#include "block_gns.h"
+#include "gns_common.h"
#include "gns.h"
#include "gnunet-service-gns_resolver.h"
-
-#define DHT_LOOKUP_TIMEOUT DHT_OPERATION_TIMEOUT
-#define DHT_GNS_REPLICATION_LEVEL 5
-#define MAX_DNS_LABEL_LENGTH 63
+#include "gnunet_vpn_service.h"
/**
- * Our handle to the namestore service
+ * Default DHT timeout for lookups.
*/
-static struct GNUNET_NAMESTORE_Handle *namestore_handle;
+#define DHT_LOOKUP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
/**
- * Our handle to the vpn service
+ * DHT replication level
*/
-static struct GNUNET_VPN_Handle *vpn_handle;
+#define DHT_GNS_REPLICATION_LEVEL 5
-/**
- * Resolver handle to the dht
- */
-static struct GNUNET_DHT_Handle *dht_handle;
/**
- * Heap for parallel DHT lookups
+ * DLL to hold the authority chain we had to pass in the resolution
+ * process.
*/
-static struct GNUNET_CONTAINER_Heap *dht_lookup_heap;
+struct AuthorityChain
+{
+ /**
+ * This is a DLL.
+ */
+ struct AuthorityChain *prev;
+
+ /**
+ * This is a DLL.
+ */
+ struct AuthorityChain *next;
+
+ /**
+ * label corresponding to the authority
+ */
+ char label[GNUNET_DNSPARSER_MAX_LABEL_LENGTH];
+
+ /**
+ * #GNUNET_YES if the authority was a GNS authority,
+ * #GNUNET_NO if the authority was a DNS authority.
+ */
+ int gns_authority;
+
+ /**
+ * Information about the resolver authority for this label.
+ */
+ union
+ {
+
+ /**
+ * The zone of the GNS authority
+ */
+ struct GNUNET_CRYPTO_EccPublicKey gns_authority;
+
+ struct
+ {
+ /**
+ * Domain of the DNS resolver that is the authority.
+ * (appended to construct the DNS name to resolve;
+ * this is NOT the DNS name of the DNS server!).
+ */
+ char name[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
+
+ /**
+ * IP address of the DNS resolver that is authoritative.
+ * (this implementation currently only supports one
+ * IP at a time).
+ */
+ struct sockaddr_storage dns_ip;
+
+ } dns_authority;
+
+ } authority_info;
+
+};
+
/**
- * Heap for namestore queues
+ * Resolution status indicator
*/
-static struct GNUNET_CONTAINER_Heap *ns_task_heap;
+enum ResolutionStatus
+{
+ /**
+ * the name to lookup exists
+ */
+ RSL_RECORD_EXISTS = 1,
+
+ /**
+ * the name in the record expired
+ */
+ RSL_RECORD_EXPIRED = 2,
+
+ /**
+ * resolution timed out
+ */
+ RSL_TIMED_OUT = 4,
+
+ /**
+ * Found VPN delegation
+ */
+ RSL_DELEGATE_VPN = 8,
+
+ /**
+ * Found NS delegation
+ */
+ RSL_DELEGATE_NS = 16,
+
+ /**
+ * Found PKEY delegation
+ */
+ RSL_DELEGATE_PKEY = 32,
+
+ /**
+ * Found CNAME record
+ */
+ RSL_CNAME_FOUND = 64,
+
+ /**
+ * Found PKEY has been revoked
+ */
+ RSL_PKEY_REVOKED = 128
+};
+
/**
- * Maximum amount of parallel queries in background
+ * Handle to a currenty pending resolution. On result (positive or
+ * negative) the #GNS_ResultProcessor is called.
*/
-static unsigned long long max_allowed_background_queries;
+struct GNS_ResolverHandle
+{
+
+ /**
+ * DLL
+ */
+ struct GNS_ResolverHandle *next;
+
+ /**
+ * DLL
+ */
+ struct GNS_ResolverHandle *prev;
+
+ /**
+ * The top-level GNS authoritative zone to query
+ */
+ struct GNUNET_CRYPTO_EccPublicKey authority_zone;
+
+ /**
+ * called when resolution phase finishes
+ */
+ GNS_ResultProcessor proc;
+
+ /**
+ * closure passed to proc
+ */
+ void* proc_cls;
+
+ /**
+ * Handle for DHT lookups. should be NULL if no lookups are in progress
+ */
+ struct GNUNET_DHT_GetHandle *get_handle;
+
+ /**
+ * Handle to a VPN request, NULL if none is active.
+ */
+ struct GNUNET_VPN_RedirectionRequest *vpn_handle;
+
+ /**
+ * Socket for a DNS request, NULL if none is active.
+ */
+ struct GNUNET_DNSSTUB_RequestSocket *dns_request;
+
+ /**
+ * Pending Namestore task
+ */
+ struct GNUNET_NAMESTORE_QueueEntry *namestore_task;
+
+ /**
+ * Heap node associated with this lookup. Used to limit number of
+ * concurrent requests.
+ */
+ struct GNUNET_CONTAINER_HeapNode *dht_heap_node;
+
+ /**
+ * DLL to store the authority chain
+ */
+ struct AuthorityChain *authority_chain_head;
+
+ /**
+ * DLL to store the authority chain
+ */
+ struct AuthorityChain *authority_chain_tail;
+
+ /**
+ * Private key of the shorten zone, NULL to not shorten.
+ */
+ struct GNUNET_CRYPTO_EccPrivateKey *shorten_key;
+
+ /**
+ * The name to resolve
+ */
+ char name[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
+
+ /**
+ * Current offset in 'name' where we are resolving.
+ */
+ size_t name_resolution_pos;
+
+ /**
+ * Use only cache
+ */
+ int only_cached;
+
+};
+
/**
- * Maximum amount of parallel namestore tasks in background
+ * Handle for a PSEU lookup used to shorten names.
*/
-static unsigned long long max_allowed_ns_tasks;
+struct GetPseuAuthorityHandle
+{
+ /**
+ * DLL
+ */
+ struct GetPseuAuthorityHandle *next;
+
+ /**
+ * DLL
+ */
+ struct GetPseuAuthorityHandle *prev;
+
+ /**
+ * Private key of the (shorten) zone to store the resulting
+ * pseudonym in.
+ */
+ struct GNUNET_CRYPTO_EccPrivateKey shorten_zone_key;
+
+ /**
+ * Original label (used if no PSEU record is found).
+ */
+ char label[GNUNET_DNSPARSER_MAX_LABEL_LENGTH + 1];
+
+ /**
+ * The zone for which we are trying to find the PSEU record.
+ */
+ struct GNUNET_CRYPTO_EccPublicKey target_zone;
+
+ /**
+ * Handle for DHT lookups. Should be NULL if no lookups are in progress
+ */
+ struct GNUNET_DHT_GetHandle *get_handle;
+
+ /**
+ * Handle to namestore request
+ */
+ struct GNUNET_NAMESTORE_QueueEntry *namestore_task;
+
+ /**
+ * Task to abort DHT lookup operation.
+ */
+ GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+
+};
+
/**
- * Wheather or not to ignore pending records
+ * Our handle to the namestore service
*/
-static int ignore_pending_records;
+static struct GNUNET_NAMESTORE_Handle *namestore_handle;
/**
- * Our local zone
+ * Our handle to the vpn service
*/
-static struct GNUNET_CRYPTO_ShortHashCode local_zone;
+static struct GNUNET_VPN_Handle *vpn_handle;
/**
- * Background shortening handles
+ * Resolver handle to the dht
*/
-static struct GetPseuAuthorityHandle *gph_head;
+static struct GNUNET_DHT_Handle *dht_handle;
/**
- * Background shortening handles
+ * Handle to perform DNS lookups.
*/
-static struct GetPseuAuthorityHandle *gph_tail;
+static struct GNUNET_DNSSTUB_Context *dns_handle;
/**
- * Resolver lookup list
+ * Heap for limiting parallel DHT lookups
*/
-static struct ResolverHandle *rlh_head;
+static struct GNUNET_CONTAINER_Heap *dht_lookup_heap;
/**
- * Resolver lookup list
+ * Maximum amount of parallel queries in background
*/
-static struct ResolverHandle *rlh_tail;
+static unsigned long long max_allowed_background_queries;
/**
- * Resolver shorten list
+ * Head of PSEU/shorten operations list.
*/
-static struct ResolverHandle *nsh_head;
+struct GetPseuAuthorityHandle *gph_head;
/**
- * Resolver shorten list
+ * Tail of PSEU/shorten operations list.
*/
-static struct ResolverHandle *nsh_tail;
+struct GetPseuAuthorityHandle *gph_tail;
/**
- * Resolver get auth list
+ * Head of resolver lookup list
*/
-static struct ResolverHandle *nah_head;
+static struct GNS_ResolverHandle *rlh_head;
/**
- * Resolver get auth list
+ * Tail of resolver lookup list
*/
-static struct ResolverHandle *nah_tail;
+static struct GNS_ResolverHandle *rlh_tail;
/**
* Global configuration.
*/
static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
/**
- * a resolution identifier pool variable
- * FIXME overflow?
- * This is a non critical identifier useful for debugging
+ * Check if name is in srv format (_x._y.xxx)
+ *
+ * @param name
+ * @return GNUNET_YES if true
*/
-static unsigned long long rid = 0;
-
static int
-is_srv (char* name)
+is_srv (const char *name)
{
- char* ndup;
- int ret = 1;
+ char *ndup;
+ int ret;
if (*name != '_')
- return 0;
+ return GNUNET_NO;
if (NULL == strstr (name, "._"))
- return 0;
-
+ return GNUNET_NO;
+ ret = GNUNET_YES;
ndup = GNUNET_strdup (name);
strtok (ndup, ".");
-
if (NULL == strtok (NULL, "."))
- ret = 0;
-
+ ret = GNUNET_NO;
if (NULL == strtok (NULL, "."))
- ret = 0;
-
+ ret = GNUNET_NO;
if (NULL != strtok (NULL, "."))
- ret = 0;
-
+ ret = GNUNET_NO;
+ GNUNET_free (ndup);
return ret;
}
+
/**
- * Determine if this name is canonical.
- * i.e.
- * a.b.gnunet = not canonical
- * a = canonical
+ * Determine if this name is canonical (is a legal name in a zone, without delegation);
+ * note that we do not test that the name does not contain illegal characters, we only
+ * test for delegation. Note that service records (i.e. _foo._srv) are canonical names
+ * even though they consist of multiple labels.
+ *
+ * Examples:
+ * a.b.gads = not canonical
+ * a = canonical
+ * _foo._srv = canonical
+ * _f.bar = not canonical
*
* @param name the name to test
- * @return 1 if canonical
+ * @return GNUNET_YES if canonical
*/
static int
-is_canonical(char* name)
+is_canonical (const char *name)
{
- char* ndup;
- char* tok;
-
- ndup = GNUNET_strdup (name);
- strtok (ndup, ".");
+ const char *pos;
+ const char *dot;
- for (tok = strtok (NULL, "."); tok != NULL; tok = strtok (NULL, "."))
- {
- /*
- * probably srv
- */
- if (*tok == '_')
- continue;
- GNUNET_free (ndup);
- return 0;
- }
- GNUNET_free (ndup);
- return 1;
+ if (NULL == strchr (name, '.'))
+ return GNUNET_YES;
+ if ('_' != name[0])
+ return GNUNET_NO;
+ pos = &name[1];
+ while (NULL != (dot = strchr (pos, '.')))
+ if ('_' != dot[1])
+ return GNUNET_NO;
+ else
+ pos = dot + 1;
+ return GNUNET_YES;
}
+/* ******************** Shortening logic ************************ */
+
+
/**
- * Callback that shortens authorities
+ * Cleanup a 'struct GetPseuAuthorityHandle', terminating all
+ * pending activities.
*
- * @param gph the handle containing the name to shorten
+ * @param gph handle to terminate
*/
static void
-shorten_authority_chain (struct GetPseuAuthorityHandle *gph);
+free_get_pseu_authority_handle (struct GetPseuAuthorityHandle *gph)
+{
+ if (NULL != gph->get_handle)
+ {
+ GNUNET_DHT_get_stop (gph->get_handle);
+ gph->get_handle = NULL;
+ }
+ if (NULL != gph->namestore_task)
+ {
+ GNUNET_NAMESTORE_cancel (gph->namestore_task);
+ gph->namestore_task = NULL;
+ }
+ if (GNUNET_SCHEDULER_NO_TASK != gph->timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (gph->timeout_task);
+ gph->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ GNUNET_CONTAINER_DLL_remove (gph_head, gph_tail, gph);
+ GNUNET_free (gph);
+}
+/**
+ * Continuation for pkey record creation (shorten)
+ *
+ * @param cls a GetPseuAuthorityHandle
+ * @param success unused
+ * @param emsg unused
+ */
static void
-create_pseu_cont (void* cls, int32_t success, const char* emsg)
+create_pkey_cont (void* cls,
+ int32_t success,
+ const char *emsg)
{
- //FIXME do sth with error
- struct GetPseuAuthorityHandle* gph = (struct GetPseuAuthorityHandle*)cls;
- struct AuthorityChain *iter;
+ struct GetPseuAuthorityHandle* gph = cls;
gph->namestore_task = NULL;
- do
- {
- iter = gph->ahead->next;
- GNUNET_free (gph->ahead);
- gph->ahead = iter;
- } while (iter != NULL);
- GNUNET_CRYPTO_rsa_key_free (gph->key);
- GNUNET_CONTAINER_DLL_remove (gph_head, gph_tail, gph);
- GNUNET_free (gph);
+ free_get_pseu_authority_handle (gph);
}
/**
* Namestore calls this function if we have record for this name.
- * (or with rd_count=0 to indicate no matches)
+ * (or with rd_count=0 to indicate no matches).
*
* @param cls the pending query
* @param key the key of the zone we did the lookup
- * @param expiration expiration date of the namestore entry
* @param name the name for which we need an authority
* @param rd_count the number of records with 'name'
* @param rd the record data
- * @param signature the signature of the authority for the record data
*/
static void
-process_pseu_lookup_ns (void* cls,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *key,
- struct GNUNET_TIME_Absolute expiration,
- const char *name, unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_RsaSignature *signature)
+process_pseu_lookup_ns (void *cls,
+ const struct GNUNET_CRYPTO_EccPrivateKey *key,
+ const char *name,
+ unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd)
{
- struct GetPseuAuthorityHandle* gph = (struct GetPseuAuthorityHandle*)cls;
+ struct GetPseuAuthorityHandle *gph = cls;
struct GNUNET_NAMESTORE_RecordData new_pkey;
- struct AuthorityChain *iter;
gph->namestore_task = NULL;
if (rd_count > 0)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_AUTO_PSEU: Name %s already taken in NS!\n", name);
- if (0 == strcmp (gph->name, name))
- {
- if (gph->ahead->next != NULL)
- {
- if (GNUNET_CRYPTO_short_hash_cmp (&gph->ahead->next->zone,
- &gph->our_zone))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "GNS_GET_AUTH: trying next!\n");
- iter = gph->ahead->next;
- GNUNET_free (gph->ahead);
- gph->ahead = iter;
- shorten_authority_chain (gph);
- return;
- }
- }
-
- /* Clean up */
- do
- {
- iter = gph->ahead->next;
- GNUNET_free (gph->ahead);
- gph->ahead = iter;
- } while (iter != NULL);
- GNUNET_CRYPTO_rsa_key_free (gph->key);
- GNUNET_CONTAINER_DLL_remove (gph_head, gph_tail, gph);
- GNUNET_free (gph);
- return;
- }
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_AUTO_PSEU: Trying delegated name %s\n", gph->name);
- memcpy (gph->test_name, gph->name, strlen (gph->name)+1);
- gph->namestore_task = GNUNET_NAMESTORE_lookup_record (namestore_handle,
- &gph->our_zone,
- gph->test_name,
- GNUNET_NAMESTORE_TYPE_ANY,
- &process_pseu_lookup_ns,
- gph);
+ "Name `%s' already taken, cannot shorten.\n",
+ name);
+ /* if this was not yet the original label, try one more
+ time, this time not using PSEU but the original label */
+ if (0 == strcmp (name,
+ gph->label))
+ free_get_pseu_authority_handle (gph);
+ else
+ gph->namestore_task = GNUNET_NAMESTORE_lookup (namestore_handle,
+ &gph->shorten_zone_key,
+ gph->label,
+ GNUNET_NAMESTORE_TYPE_ANY,
+ &process_pseu_lookup_ns,
+ gph);
return;
}
-
- /* name is free */
+ /* name is available */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_AUTO_PSEU: Name %s not taken in NS! Adding\n", gph->test_name);
-
+ "Shortening `%s' to `%s'\n",
+ GNUNET_NAMESTORE_z2s (&gph->target_zone),
+ name);
new_pkey.expiration_time = UINT64_MAX;
- new_pkey.data_size = sizeof (struct GNUNET_CRYPTO_ShortHashCode);
- new_pkey.data = &gph->ahead->zone;
- new_pkey.record_type = GNUNET_GNS_RECORD_PKEY;
+ new_pkey.data_size = sizeof (struct GNUNET_CRYPTO_EccPublicKey);
+ new_pkey.data = &gph->target_zone;
+ new_pkey.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
new_pkey.flags = GNUNET_NAMESTORE_RF_AUTHORITY
| GNUNET_NAMESTORE_RF_PRIVATE
| GNUNET_NAMESTORE_RF_PENDING;
- gph->namestore_task = GNUNET_NAMESTORE_record_create (namestore_handle,
- gph->key,
- gph->test_name,
- &new_pkey,
- &create_pseu_cont, //cont
- gph); //cls
+ gph->namestore_task
+ = GNUNET_NAMESTORE_records_store (namestore_handle,
+ &gph->shorten_zone_key,
+ name,
+ 1, &new_pkey,
+ &create_pkey_cont, gph);
}
+
/**
- * process result of a dht pseu lookup
+ * Process result of a DHT lookup for a PSEU record.
*
- * @param gph the handle
- * @param name the pseu result or NULL
+ * @param gph the handle to our shorten operation
+ * @param pseu the pseu result or NULL
*/
static void
-process_pseu_result (struct GetPseuAuthorityHandle* gph, char* name)
+process_pseu_result (struct GetPseuAuthorityHandle* gph,
+ const char *pseu)
{
- if (NULL == name)
- {
- memcpy (gph->test_name, gph->ahead->name, strlen (gph->ahead->name)+1);
- }
- else
+ if (NULL == pseu)
{
- memcpy (gph->test_name, name, strlen(name)+1);
+ /* no PSEU found, try original label */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "No PSEU found, trying original label `%s' instead.\n",
+ gph->label);
+ gph->namestore_task = GNUNET_NAMESTORE_lookup (namestore_handle,
+ &gph->shorten_zone_key,
+ gph->label,
+ GNUNET_NAMESTORE_TYPE_ANY,
+ &process_pseu_lookup_ns,
+ gph);
+ return;
}
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_AUTO_PSEU: Checking %s for collision in NS\n",
- gph->test_name);
-
- /**
- * Check for collision
- */
- gph->namestore_task = GNUNET_NAMESTORE_lookup_record (namestore_handle,
- &gph->our_zone,
- gph->test_name,
- GNUNET_NAMESTORE_TYPE_ANY,
- &process_pseu_lookup_ns,
- gph);
+
+ /* check if 'pseu' is taken */
+ gph->namestore_task = GNUNET_NAMESTORE_lookup (namestore_handle,
+ &gph->shorten_zone_key,
+ pseu,
+ GNUNET_NAMESTORE_TYPE_ANY,
+ &process_pseu_lookup_ns,
+ gph);
}
+
/**
- * Handle timeout for dht request
+ * Handle timeout for DHT request during shortening.
*
* @param cls the request handle as closure
* @param tc the task context
*/
static void
-handle_auth_discovery_timeout(void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+handle_auth_discovery_timeout (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GetPseuAuthorityHandle* gph = (struct GetPseuAuthorityHandle*)cls;
- struct AuthorityChain *iter;
+ struct GetPseuAuthorityHandle *gph = cls;
+ gph->timeout_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_GET_AUTH: dht lookup for query PSEU timed out.\n");
+ "DHT lookup for PSEU query timed out.\n");
GNUNET_DHT_get_stop (gph->get_handle);
gph->get_handle = NULL;
-
- if (gph->ahead->next != NULL)
+ process_pseu_result (gph, NULL);
+}
+
+
+/**
+ * Handle decrypted records from DHT result.
+ *
+ * @param cls closure with our 'struct GetPseuAuthorityHandle'
+ * @param rd_count number of entries in 'rd' array
+ * @param rd array of records with data to store
+ */
+static void
+process_auth_records (void *cls,
+ unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd)
+{
+ struct GetPseuAuthorityHandle *gph = cls;
+ unsigned int i;
+
+ for (i=0; i < rd_count; i++)
{
- if (GNUNET_CRYPTO_short_hash_cmp (&gph->ahead->next->zone,
- &gph->our_zone))
+ if (GNUNET_NAMESTORE_TYPE_PSEU == rd[i].record_type)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "GNS_GET_AUTH: trying next!\n");
- iter = gph->ahead->next;
- GNUNET_free (gph->ahead);
- gph->ahead = iter;
- shorten_authority_chain (gph);
+ /* found pseu */
+ process_pseu_result (gph,
+ (const char *) rd[i].data);
return;
}
}
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "No PSEU record found in DHT reply.\n");
process_pseu_result (gph, NULL);
}
+
/**
* Function called when we find a PSEU entry in the DHT
*
* @param data the record data
*/
static void
-process_auth_discovery_dht_result(void* cls,
- struct GNUNET_TIME_Absolute exp,
- const struct GNUNET_HashCode * key,
- const struct GNUNET_PeerIdentity *get_path,
- unsigned int get_path_length,
- const struct GNUNET_PeerIdentity *put_path,
- unsigned int put_path_length,
- enum GNUNET_BLOCK_Type type,
- size_t size, const void *data)
+process_auth_discovery_dht_result (void* cls,
+ struct GNUNET_TIME_Absolute exp,
+ const struct GNUNET_HashCode *key,
+ const struct GNUNET_PeerIdentity *get_path,
+ unsigned int get_path_length,
+ const struct GNUNET_PeerIdentity *put_path,
+ unsigned int put_path_length,
+ enum GNUNET_BLOCK_Type type,
+ size_t size,
+ const void *data)
{
- struct GetPseuAuthorityHandle* gph = (struct GetPseuAuthorityHandle*)cls;
- struct AuthorityChain *iter;
- struct GNSNameRecordBlock *nrb;
- char* rd_data = (char*)data;
- char* name;
- int num_records;
- size_t rd_size;
- int i;
+ struct GetPseuAuthorityHandle *gph = cls;
+ const struct GNUNET_NAMESTORE_Block *block;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_GET_AUTH: got dht result (size=%d)\n", size);
-
-
- /* stop lookup and timeout task */
+ "Got DHT result for PSEU request\n");
GNUNET_DHT_get_stop (gph->get_handle);
gph->get_handle = NULL;
- GNUNET_SCHEDULER_cancel (gph->timeout);
-
- if (data == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "GNS_GET_AUTH: got dht result null!\n", size);
-
- do
- {
- iter = gph->ahead->next;
- GNUNET_free (gph->ahead);
- gph->ahead = iter;
- } while (iter != NULL);
- GNUNET_CRYPTO_rsa_key_free (gph->key);
- GNUNET_CONTAINER_DLL_remove (gph_head, gph_tail, gph);
- GNUNET_free (gph);
- return;
- }
-
- nrb = (struct GNSNameRecordBlock*)data;
-
-
-
- nrb = (struct GNSNameRecordBlock*)data;
-
- name = (char*)&nrb[1];
- num_records = ntohl (nrb->rd_count);
- {
- struct GNUNET_NAMESTORE_RecordData rd[num_records];
-
- rd_data += strlen (name) + 1 + sizeof (struct GNSNameRecordBlock);
- rd_size = size - strlen (name) - 1 - sizeof (struct GNSNameRecordBlock);
-
- if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (rd_size,
- rd_data,
- num_records,
- rd))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "GNS_GET_AUTH: Error deserializing data!\n");
- }
- else
- {
- for (i=0; i < num_records; i++)
- {
- if ((strcmp (name, "+") == 0) &&
- (rd[i].record_type == GNUNET_GNS_RECORD_PSEU))
- {
- /* found pseu */
- process_pseu_result (gph, (char*)rd[i].data);
- return;
- }
- }
- }
- }
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "GNS_GET_AUTH: no pseu in dht!\n");
+ GNUNET_SCHEDULER_cancel (gph->timeout_task);
+ gph->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- if (gph->ahead->next != NULL)
+ if (NULL == data)
{
- if (GNUNET_CRYPTO_short_hash_cmp (&gph->ahead->next->zone,
- &gph->our_zone))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "GNS_GET_AUTH: trying next!\n");
- iter = gph->ahead->next;
- GNUNET_free (gph->ahead);
- gph->ahead = iter;
- shorten_authority_chain (gph);
- return;
- }
+ /* is this allowed!? */
+ GNUNET_break (0);
+ process_pseu_result (gph, NULL);
+ return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_GET_AUTH: finished shorten, no results!\n");
- process_pseu_result (gph, NULL);
-}
-
-/**
- * Process PSEU discovery for shorten via namestore
- *
- * @param cls the GetPseuAuthorityHandle
- * @param key the public key
- * @param expiration recorddata expiration
- * @param name the looked up name
- * @param rd_count number of records in set
- * @param rd record data
- * @param signature the signature
- */
-static void
-process_auth_discovery_ns_result(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)
-{
- uint32_t xquery;
- struct GNUNET_CRYPTO_ShortHashCode name_hash;
- struct GNUNET_HashCode lookup_key;
- struct GNUNET_CRYPTO_HashAsciiEncoded lookup_key_string;
- struct GNUNET_HashCode name_hash_double;
- struct GNUNET_HashCode zone_hash_double;
- int i;
- struct GetPseuAuthorityHandle* gph = (struct GetPseuAuthorityHandle*)cls;
- struct AuthorityChain *iter;
-
- gph->namestore_task = NULL;
- /* no pseu found */
- if (rd_count == 0)
+ if (size < sizeof (struct GNUNET_NAMESTORE_Block))
{
- /**
- * check dht
- */
- GNUNET_CRYPTO_short_hash ("+", strlen ("+"), &name_hash);
- GNUNET_CRYPTO_short_hash_double (&name_hash, &name_hash_double);
- GNUNET_CRYPTO_short_hash_double (&gph->ahead->zone, &zone_hash_double);
- GNUNET_CRYPTO_hash_xor (&name_hash_double, &zone_hash_double, &lookup_key);
- GNUNET_CRYPTO_hash_to_enc (&lookup_key, &lookup_key_string);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_AUTO_PSEU: starting dht lookup for %s with key: %s\n",
- "+", (char*)&lookup_key_string);
-
- gph->timeout = GNUNET_SCHEDULER_add_delayed (DHT_LOOKUP_TIMEOUT,
- &handle_auth_discovery_timeout, gph);
-
- xquery = htonl (GNUNET_GNS_RECORD_PSEU);
-
- GNUNET_assert (gph->get_handle == NULL);
-
- gph->get_handle = GNUNET_DHT_get_start(dht_handle,
- GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
- &lookup_key,
- DHT_GNS_REPLICATION_LEVEL,
- GNUNET_DHT_RO_NONE,
- &xquery,
- sizeof(xquery),
- &process_auth_discovery_dht_result,
- gph);
- return;
+ /* how did this pass DHT block validation!? */
+ GNUNET_break (0);
+ process_pseu_result (gph, NULL);
+ return;
}
-
- for (i=0; i < rd_count; i++)
+ block = data;
+ if (size !=
+ ntohs (block->purpose.size) +
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey) +
+ sizeof (struct GNUNET_CRYPTO_EccSignature))
{
- if ((strcmp (name, "+") == 0) &&
- (rd[i].record_type == GNUNET_GNS_RECORD_PSEU))
- {
- /* found pseu */
- process_pseu_result (gph, (char*)rd[i].data);
- return;
- }
+ /* how did this pass DHT block validation!? */
+ GNUNET_break (0);
+ process_pseu_result (gph, NULL);
+ return;
}
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "GNS_GET_AUTH: no pseu in namestore!\n");
-
- if (gph->ahead->next != NULL)
+ if (GNUNET_OK !=
+ GNUNET_NAMESTORE_block_decrypt (block,
+ &gph->target_zone,
+ GNUNET_GNS_TLD_PLUS,
+ &process_auth_records,
+ gph))
{
- if (GNUNET_CRYPTO_short_hash_cmp (&gph->ahead->next->zone,
- &gph->our_zone))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "GNS_GET_AUTH: trying next!\n");
- iter = gph->ahead->next;
- GNUNET_free (gph->ahead);
- gph->ahead = iter;
- shorten_authority_chain (gph);
- return;
- }
+ /* other peer encrypted invalid block, complain */
+ GNUNET_break_op (0);
+ process_pseu_result (gph, NULL);
+ return;
}
-
- process_pseu_result (gph, NULL);
}
+
/**
- * Callback called by namestore for a zone to name
- * result
+ * Callback called by namestore for a zone to name result. We're
+ * trying to see if a short name for a given zone already exists.
*
* @param cls the closure
* @param zone_key the zone we queried
- * @param expire the expiration time of the name
* @param name the name found or NULL
* @param rd_len number of records for the name
* @param rd the record data (PKEY) for the name
- * @param signature the signature for the record data
*/
static void
process_zone_to_name_discover (void *cls,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
- struct GNUNET_TIME_Absolute expire,
- const char *name,
- unsigned int rd_len,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_RsaSignature *signature)
+ const struct GNUNET_CRYPTO_EccPrivateKey *zone_key,
+ const char *name,
+ unsigned int rd_len,
+ const struct GNUNET_NAMESTORE_RecordData *rd)
{
- struct GetPseuAuthorityHandle* gph = (struct GetPseuAuthorityHandle*)cls;
- struct AuthorityChain *iter;
+ struct GetPseuAuthorityHandle* gph = cls;
+ struct GNUNET_HashCode lookup_key;
gph->namestore_task = NULL;
- /* we found a match in our own zone */
- if (rd_len != 0)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_AUTO_PSEU: name for zone in our root %s\n", name);
-
- iter = gph->ahead;
- do
- {
- iter = gph->ahead->next;
- GNUNET_free (gph->ahead);
- gph->ahead = iter;
- } while (iter != NULL);
- GNUNET_CRYPTO_rsa_key_free (gph->key);
- GNUNET_CONTAINER_DLL_remove (gph_head, gph_tail, gph);
- GNUNET_free (gph);
- }
- else
+ if (0 != rd_len)
{
-
- gph->namestore_task = GNUNET_NAMESTORE_lookup_record (namestore_handle,
- &gph->ahead->zone,
- "+",
- GNUNET_GNS_RECORD_PSEU,
- &process_auth_discovery_ns_result,
- gph);
+ /* we found a match in our own zone */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Shortening aborted, name `%s' already reserved for the zone\n",
+ name);
+ free_get_pseu_authority_handle (gph);
+ return;
}
-
+ /* record does not yet exist, go into DHT to find PSEU record */
+ GNUNET_NAMESTORE_query_from_public_key (&gph->target_zone,
+ GNUNET_GNS_TLD_PLUS,
+ &lookup_key);
+ gph->timeout_task = GNUNET_SCHEDULER_add_delayed (DHT_LOOKUP_TIMEOUT,
+ &handle_auth_discovery_timeout,
+ gph);
+ gph->get_handle = GNUNET_DHT_get_start (dht_handle,
+ GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
+ &lookup_key,
+ DHT_GNS_REPLICATION_LEVEL,
+ GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
+ NULL, 0,
+ &process_auth_discovery_dht_result,
+ gph);
}
/**
- * Callback that shortens authorities
+ * Start shortening algorithm, try to allocate a nice short
+ * canonical name for @a pub in @a shorten_zone, using
+ * @a original_label as one possible suggestion.
*
- * @param gph the handle to the shorten request
+ * @param original_label original label for the zone
+ * @param pub public key of the zone to shorten
+ * @param shorten_zone private key of the target zone for the new record
*/
static void
-shorten_authority_chain (struct GetPseuAuthorityHandle *gph)
-{
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_AUTO_PSEU: New authority %s discovered\n",
- gph->ahead->name);
-
- gph->namestore_task = GNUNET_NAMESTORE_zone_to_name (namestore_handle,
- &gph->our_zone,
- &gph->ahead->zone,
- &process_zone_to_name_discover,
- gph);
-
-}
-
-static void
-start_shorten (struct AuthorityChain *atail,
- struct GNUNET_CRYPTO_RsaPrivateKey *key)
+start_shorten (const char *original_label,
+ const struct GNUNET_CRYPTO_EccPublicKey *pub,
+ const struct GNUNET_CRYPTO_EccPrivateKey *shorten_zone)
{
- struct AuthorityChain *new_head = NULL;
- struct AuthorityChain *new_tail = NULL;
- struct AuthorityChain *iter;
- struct AuthorityChain *acopy;
struct GetPseuAuthorityHandle *gph;
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
- struct GNUNET_CRYPTO_RsaPrivateKeyBinaryEncoded *pb_key;
-
- /* First copy the authority chain in reverse order */
- for (iter = atail; iter != NULL; iter = iter->prev)
- {
- acopy = GNUNET_malloc (sizeof (struct AuthorityChain));
- memcpy (acopy, iter, sizeof (struct AuthorityChain));
- acopy->next = NULL;
- acopy->prev = NULL;
- GNUNET_CONTAINER_DLL_insert (new_head, new_tail, acopy);
- }
-
- gph = GNUNET_malloc (sizeof (struct GetPseuAuthorityHandle));
-
- GNUNET_CRYPTO_rsa_key_get_public (key, &pkey);
- pb_key = GNUNET_CRYPTO_rsa_encode_key (key);
- gph->key = GNUNET_CRYPTO_rsa_decode_key ((char*)pb_key, ntohs (pb_key->len));
- //gph->key = key;//GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_RsaPrivateKey));
- //memcpy (gph->key, key, sizeof (struct GNUNET_CRYPTO_RsaPrivateKey));
-
- GNUNET_CRYPTO_short_hash (&pkey,
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &gph->our_zone);
- gph->ahead = new_head;
-
- GNUNET_CONTAINER_DLL_insert (gph_head, gph_tail, gph);
-
- shorten_authority_chain (gph);
-}
-
-/**
- * Initialize the resolver
- *
- * @param nh the namestore handle
- * @param dh the dht handle
- * @param lz the local zone's hash
- * @param c configuration handle
- * @param max_bg_queries maximum number of parallel background queries in dht
- * @param ignore_pending ignore records that still require user confirmation
- * on lookup
- * @return GNUNET_OK on success
- */
-int
-gns_resolver_init (struct GNUNET_NAMESTORE_Handle *nh,
- struct GNUNET_DHT_Handle *dh,
- struct GNUNET_CRYPTO_ShortHashCode lz,
- const struct GNUNET_CONFIGURATION_Handle *c,
- unsigned long long max_bg_queries,
- int ignore_pending)
-{
- cfg = c;
- namestore_handle = nh;
- dht_handle = dh;
- local_zone = lz;
- dht_lookup_heap =
- GNUNET_CONTAINER_heap_create(GNUNET_CONTAINER_HEAP_ORDER_MIN);
- ns_task_heap =
- GNUNET_CONTAINER_heap_create(GNUNET_CONTAINER_HEAP_ORDER_MIN);
- max_allowed_background_queries = max_bg_queries;
- max_allowed_ns_tasks = GNUNET_GNS_MAX_NS_TASKS;
-
- ignore_pending_records = ignore_pending;
-
- gph_head = NULL;
- gph_tail = NULL;
- rlh_head = NULL;
- rlh_tail = NULL;
- nsh_head = NULL;
- nsh_tail = NULL;
- nah_head = NULL;
- nah_tail = NULL;
- GNUNET_RESOLVER_connect (cfg);
-
-
- if ((namestore_handle != NULL) && (dht_handle != NULL))
+ if (strlen (original_label) > GNUNET_DNSPARSER_MAX_LABEL_LENGTH)
{
- return GNUNET_OK;
+ GNUNET_break (0);
+ return;
}
-
- return GNUNET_SYSERR;
-}
-
-
-/**
- * Cleanup ns tasks
- *
- * @param cls closure to iterator
- * @param node heap nodes
- * @param element the namestorebgtask
- * @param cost heap cost
- * @return always GNUNET_YES
- */
-static int
-cleanup_pending_ns_tasks(void* cls,
- struct GNUNET_CONTAINER_HeapNode *node,
- void *element,
- GNUNET_CONTAINER_HeapCostType cost)
-{
- struct NamestoreBGTask *nbg = (struct NamestoreBGTask *)element;
- ResolverCleanupContinuation cont = cls;
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_CLEANUP: Terminating ns task\n");
- GNUNET_NAMESTORE_cancel (nbg->qe);
-
- GNUNET_CONTAINER_heap_remove_node(node);
-
- if (GNUNET_CONTAINER_heap_get_size(ns_task_heap) == 0)
- cont();
-
- return GNUNET_YES;
+ gph = GNUNET_new (struct GetPseuAuthorityHandle);
+ gph->shorten_zone_key = *shorten_zone;
+ gph->target_zone = *pub;
+ strcpy (gph->label, original_label);
+ GNUNET_CONTAINER_DLL_insert (gph_head, gph_tail, gph);
+ /* first, check if we *already* have a record for this zone */
+ gph->namestore_task = GNUNET_NAMESTORE_zone_to_name (namestore_handle,
+ shorten_zone,
+ pub,
+ &process_zone_to_name_discover,
+ gph);
}
-/**
- * finish lookup
- *
- * @param rh resolver handle
- * @param rlh record lookup handle
- * @param rd_count number of results
- * @param rd results
- */
-static void
-finish_lookup (struct ResolverHandle *rh,
- struct RecordLookupHandle* rlh,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd);
-
-
-/**
- * Cleanup background lookups FIXME get rid of this??
- *
- * @param cls closure to iterator
- * @param node heap nodes
- * @param element the resolver handle
- * @param cost heap cost
- * @return always GNUNET_YES
- */
-static int
-cleanup_pending_background_queries (void* cls,
- struct GNUNET_CONTAINER_HeapNode *node,
- void *element,
- GNUNET_CONTAINER_HeapCostType cost)
-{
- struct ResolverHandle *rh = (struct ResolverHandle *)element;
- ResolverCleanupContinuation cont = cls;
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_CLEANUP-%llu: Terminating background lookup for %s\n",
- rh->id, rh->name);
-
- //finish_lookup (rh, rh->proc_cls, 0, NULL);
- //rh->get_handle = NULL;
- //rh->proc(rh->proc_cls, rh, 0, NULL);
-
- GNUNET_CONTAINER_heap_remove_node(node);
-
- if (GNUNET_CONTAINER_heap_get_size(dht_lookup_heap) == 0)
- {
- if (GNUNET_CONTAINER_heap_get_size(ns_task_heap) == 0)
- cont();
- else
- {
- GNUNET_CONTAINER_heap_iterate (ns_task_heap,
- &cleanup_pending_ns_tasks,
- cont);
- }
- }
-
-
- return GNUNET_YES;
-}
-
+/* ************************** Resolution **************************** */
+#if 0
/**
* Helper function to free resolver handle
*
if (NULL == rh)
return;
- ac = rh->authority_chain_head;
-
- while (NULL != ac)
+ ac_next = rh->authority_chain_head;
+ while (NULL != (ac = ac_next))
{
ac_next = ac->next;
- GNUNET_free(ac);
- ac = ac_next;
+ GNUNET_free (ac);
}
if (NULL != rh->get_handle)
GNUNET_DHT_get_stop (rh->get_handle);
-
if (NULL != rh->dns_raw_packet)
GNUNET_free (rh->dns_raw_packet);
-
if (NULL != rh->namestore_task)
+ {
GNUNET_NAMESTORE_cancel (rh->namestore_task);
- rh->namestore_task = NULL;
-
+ rh->namestore_task = NULL;
+ }
if (GNUNET_SCHEDULER_NO_TASK != rh->dns_read_task)
GNUNET_SCHEDULER_cancel (rh->dns_read_task);
-
if (GNUNET_SCHEDULER_NO_TASK != rh->timeout_task)
GNUNET_SCHEDULER_cancel (rh->timeout_task);
-
if (NULL != rh->dns_sock)
GNUNET_NETWORK_socket_close (rh->dns_sock);
if (NULL != rh->dns_resolver_handle)
GNUNET_RESOLVER_request_cancel (rh->dns_resolver_handle);
-
if (NULL != rh->rd.data)
GNUNET_free ((void*)(rh->rd.data));
- GNUNET_free(rh);
-}
-
-
-/**
- * finish shorten
- *
- * @param rh resolver handle
- * @param nsh name shorten handle
- */
-static void
-finish_shorten (struct ResolverHandle *rh,
- struct NameShortenHandle *nsh);
-/**
- * finish get auth
- *
- * @param rh resolver handle
- * @param nah get name authority handle
- */
-static void
-finish_get_auth (struct ResolverHandle *rh,
- struct GetNameAuthorityHandle* rlh);
-/**
- * Shutdown resolver
- */
-void
-gns_resolver_cleanup (ResolverCleanupContinuation cont)
-{
- unsigned int s;
- struct GetPseuAuthorityHandle *tmp;
- struct AuthorityChain *iter;
-
-
- tmp = gph_head;
- for (tmp = gph_head; tmp != NULL; tmp = gph_head)
- {
- if (tmp->get_handle != NULL)
- GNUNET_DHT_get_stop (tmp->get_handle);
- tmp->get_handle = NULL;
- if (tmp->timeout != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (tmp->timeout);
- tmp->timeout = GNUNET_SCHEDULER_NO_TASK;
-
- if (NULL != tmp->namestore_task)
- GNUNET_NAMESTORE_cancel (tmp->namestore_task);
- tmp->namestore_task = NULL;
-
- iter = tmp->ahead;
- do
- {
- iter = tmp->ahead->next;
- GNUNET_free (tmp->ahead);
- tmp->ahead = iter;
- } while (iter != NULL);
-
- GNUNET_CRYPTO_rsa_key_free (tmp->key);
- GNUNET_CONTAINER_DLL_remove (gph_head, gph_tail, tmp);
- GNUNET_free (tmp);
- }
-
- while (NULL != rlh_head)
- {
- finish_lookup (rlh_head, rlh_head->proc_cls, 0, NULL);
- }
-
- while (NULL != nsh_head)
- {
- finish_shorten (nsh_head, nsh_head->proc_cls);
- }
-
- while (NULL != nah_head)
- {
- finish_get_auth (nah_head, nah_head->proc_cls);
- }
-
- s = GNUNET_CONTAINER_heap_get_size(dht_lookup_heap);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_CLEANUP: %d pending background queries to terminate\n", s);
- if (0 != s)
- GNUNET_CONTAINER_heap_iterate (dht_lookup_heap,
- &cleanup_pending_background_queries,
- cont);
- else if (0 != GNUNET_CONTAINER_heap_get_size(ns_task_heap))
- {
- GNUNET_CONTAINER_heap_iterate (ns_task_heap,
- &cleanup_pending_ns_tasks,
- cont);
- }
- else
- cont();
+ if (NULL != rh->dht_heap_node)
+ GNUNET_CONTAINER_heap_remove_node (rh->dht_heap_node);
+ GNUNET_free (rh);
}
-
-
/**
* Callback when record data is put into namestore
*
* @param emsg the error message. NULL if SUCCESS==GNUNET_OK
*/
void
-on_namestore_record_put_result(void *cls,
- int32_t success,
- const char *emsg)
+on_namestore_record_put_result (void *cls,
+ int32_t success,
+ const char *emsg)
{
struct NamestoreBGTask *nbg = cls;
"GNS_NS: Error putting records into namestore: %s\n", emsg);
}
-static void
-handle_lookup_timeout(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct ResolverHandle *rh = cls;
-
- if (rh->timeout_cont)
- rh->timeout_cont(rh->timeout_cont_cls, tc);
-}
-
-/**
- * Processor for background lookups in the DHT
- *
- * @param cls closure (NULL)
- * @param rd_count number of records found (not 0)
- * @param rd record data
- */
-static void
-background_lookup_result_processor(void *cls,
- uint32_t rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
-{
- //We could do sth verbose/more useful here but it doesn't make any difference
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_BG: background dht lookup finished. (%d results)\n",
- rd_count);
-}
/**
- * Handle timeout for DHT requests
+ * Function called when we get a result from the dht
+ * for our record query
*
- * @param cls the request handle as closure
- * @param tc the task context
+ * @param cls the request handle
+ * @param exp lifetime
+ * @param key the key the record was stored under
+ * @param get_path get path
+ * @param get_path_length get path length
+ * @param put_path put path
+ * @param put_path_length put path length
+ * @param type the block type
+ * @param size the size of the record
+ * @param data the record data
*/
static void
-dht_lookup_timeout(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+process_record_result_dht (void* cls,
+ struct GNUNET_TIME_Absolute exp,
+ const struct GNUNET_HashCode * key,
+ const struct GNUNET_PeerIdentity *get_path,
+ unsigned int get_path_length,
+ const struct GNUNET_PeerIdentity *put_path,
+ unsigned int put_path_length,
+ enum GNUNET_BLOCK_Type type,
+ size_t size, const void *data)
{
struct ResolverHandle *rh = cls;
- struct RecordLookupHandle *rlh = (struct RecordLookupHandle *)rh->proc_cls;
- char new_name[MAX_DNS_NAME_LENGTH];
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: dht lookup for query %s (%llus)timed out.\n",
- rh->id, rh->name, rh->timeout.rel_value);
- /**
- * Start resolution in bg
- */
- //strcpy(new_name, rh->name);
- //memcpy(new_name+strlen(new_name), GNUNET_GNS_TLD, strlen(GNUNET_GNS_TLD));
- GNUNET_snprintf(new_name, MAX_DNS_NAME_LENGTH, "%s.%s",
- rh->name, GNUNET_GNS_TLD);
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: Starting background lookup for %s type %d\n",
- rh->id, new_name, rlh->record_type);
-
- gns_resolver_lookup_record(rh->authority,
- rh->private_local_zone,
- rlh->record_type,
- new_name,
- NULL,
- GNUNET_TIME_UNIT_FOREVER_REL,
- GNUNET_NO,
- &background_lookup_result_processor,
- NULL);
- rh->timeout_task = GNUNET_SCHEDULER_NO_TASK;
-
- GNUNET_DHT_get_stop (rh->get_handle);
- rh->get_handle = NULL;
- rh->proc(rh->proc_cls, rh, 0, NULL);
-}
-
-
-/**
- * Function called when we get a result from the dht
- * for our record query
- *
- * @param cls the request handle
- * @param exp lifetime
- * @param key the key the record was stored under
- * @param get_path get path
- * @param get_path_length get path length
- * @param put_path put path
- * @param put_path_length put path length
- * @param type the block type
- * @param size the size of the record
- * @param data the record data
- */
-static void
-process_record_result_dht(void* cls,
- struct GNUNET_TIME_Absolute exp,
- const struct GNUNET_HashCode * key,
- const struct GNUNET_PeerIdentity *get_path,
- unsigned int get_path_length,
- const struct GNUNET_PeerIdentity *put_path,
- unsigned int put_path_length,
- enum GNUNET_BLOCK_Type type,
- size_t size, const void *data)
-{
- struct ResolverHandle *rh;
- struct RecordLookupHandle *rlh;
- struct GNSNameRecordBlock *nrb;
+ struct RecordLookupHandle *rlh = rh->proc_cls;
+ const struct GNSNameRecordBlock *nrb = data;
uint32_t num_records;
- char* name = NULL;
- char* rd_data = (char*)data;
- int i;
- int rd_size;
-
- rh = (struct ResolverHandle *)cls;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: got dht result (size=%d)\n", rh->id, size);
-
- //FIXME maybe check expiration here, check block type
-
-
- rlh = (struct RecordLookupHandle *) rh->proc_cls;
- nrb = (struct GNSNameRecordBlock*)data;
+ const char* name;
+ const char* rd_data;
+ uint32_t i;
+ size_t rd_size;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC-%llu: got dht result (size=%d)\n", rh->id, size);
/* stop lookup and timeout task */
GNUNET_DHT_get_stop (rh->get_handle);
rh->get_handle = NULL;
-
if (rh->dht_heap_node != NULL)
{
- GNUNET_CONTAINER_heap_remove_node(rh->dht_heap_node);
+ GNUNET_CONTAINER_heap_remove_node (rh->dht_heap_node);
rh->dht_heap_node = NULL;
}
-
if (rh->timeout_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel(rh->timeout_task);
+ GNUNET_SCHEDULER_cancel (rh->timeout_task);
rh->timeout_task = GNUNET_SCHEDULER_NO_TASK;
}
-
rh->get_handle = NULL;
- name = (char*)&nrb[1];
- num_records = ntohl(nrb->rd_count);
+ name = (const char*) &nrb[1];
+ num_records = ntohl (nrb->rd_count);
{
struct GNUNET_NAMESTORE_RecordData rd[num_records];
struct NamestoreBGTask *ns_heap_root;
struct NamestoreBGTask *namestore_bg_task;
- rd_data += strlen(name) + 1 + sizeof(struct GNSNameRecordBlock);
- rd_size = size - strlen(name) - 1 - sizeof(struct GNSNameRecordBlock);
-
- if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (rd_size,
- rd_data,
- num_records,
- rd))
+ rd_data = &name[strlen (name) + 1];
+ rd_size = size - strlen (name) - 1 - sizeof (struct GNSNameRecordBlock);
+ if (GNUNET_SYSERR ==
+ GNUNET_NAMESTORE_records_deserialize (rd_size,
+ rd_data,
+ num_records,
+ rd))
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "GNS_PHASE_REC-%llu: Error deserializing data!\n", rh->id);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "GNS_PHASE_REC-%llu: Error deserializing data!\n", rh->id);
+ rh->proc (rh->proc_cls, rh, 0, NULL);
return;
}
-
- for (i=0; i<num_records; i++)
+ for (i = 0; i < num_records; i++)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: Got name: %s (wanted %s)\n",
- rh->id, name, rh->name);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: Got type: %d (wanted %d)\n",
- rh->id, rd[i].record_type, rlh->record_type);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: Got data length: %d\n",
- rh->id, rd[i].data_size);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: Got flag %d\n",
- rh->id, rd[i].flags);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC-%llu: Got name: %s (wanted %s)\n",
+ rh->id, name, rh->name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC-%llu: Got type: %d (wanted %d)\n",
+ rh->id, rd[i].record_type, rlh->record_type);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC-%llu: Got data length: %d\n",
+ rh->id, rd[i].data_size);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC-%llu: Got flag %d\n",
+ rh->id, rd[i].flags);
- if ((strcmp(name, rh->name) == 0) &&
+ if ((strcmp (name, rh->name) == 0) &&
(rd[i].record_type == rlh->record_type))
- {
rh->answered++;
- }
}
ns_heap_root = GNUNET_CONTAINER_heap_remove_root (ns_task_heap);
GNUNET_NAMESTORE_cancel (ns_heap_root->qe);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: Replacing oldest background ns task\n",
- rh->id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC-%llu: Replacing oldest background ns task\n",
+ rh->id);
}
/* Save to namestore */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC-%llu: Caching record for %s\n",
+ rh->id, name);
namestore_bg_task = GNUNET_malloc (sizeof (struct NamestoreBGTask));
namestore_bg_task->qe = GNUNET_NAMESTORE_record_put (namestore_handle,
&nrb->public_key,
namestore_bg_task->node = GNUNET_CONTAINER_heap_insert (ns_task_heap,
namestore_bg_task,
- GNUNET_TIME_absolute_get().abs_value);
-
-
- if (rh->answered)
- rh->proc(rh->proc_cls, rh, num_records, rd);
- else
- rh->proc(rh->proc_cls, rh, 0, NULL);
+ GNUNET_TIME_absolute_get().abs_value_us);
+ if (0 < rh->answered)
+ rh->proc (rh->proc_cls, rh, num_records, rd);
+ else
+ rh->proc (rh->proc_cls, rh, 0, NULL);
}
-
}
static void
resolve_record_dht (struct ResolverHandle *rh)
{
+ struct RecordLookupHandle *rlh = rh->proc_cls;
uint32_t xquery;
- struct GNUNET_CRYPTO_ShortHashCode name_hash;
struct GNUNET_HashCode lookup_key;
- struct GNUNET_HashCode name_hash_double;
- struct GNUNET_HashCode zone_hash_double;
- struct GNUNET_CRYPTO_HashAsciiEncoded lookup_key_string;
- struct RecordLookupHandle *rlh = (struct RecordLookupHandle *)rh->proc_cls;
struct ResolverHandle *rh_heap_root;
- GNUNET_CRYPTO_short_hash(rh->name, strlen(rh->name), &name_hash);
- GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double);
- GNUNET_CRYPTO_short_hash_double(&rh->authority, &zone_hash_double);
- GNUNET_CRYPTO_hash_xor(&name_hash_double, &zone_hash_double, &lookup_key);
- GNUNET_CRYPTO_hash_to_enc (&lookup_key, &lookup_key_string);
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: starting dht lookup for %s with key: %s\n",
- rh->id, rh->name, (char*)&lookup_key_string);
+ GNUNET_GNS_get_key_for_record (rh->name, &rh->authority, &lookup_key);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC-%llu: starting dht lookup for %s with key: %s\n",
+ rh->id, rh->name, GNUNET_h2s (&lookup_key));
- //rh->timeout_task = GNUNET_SCHEDULER_NO_TASK;
rh->dht_heap_node = NULL;
- if (rh->timeout.rel_value != GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
+ if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != rh->timeout.rel_value_us)
{
/**
* Update timeout if necessary
*/
- if (rh->timeout_task == GNUNET_SCHEDULER_NO_TASK)
+ if (GNUNET_SCHEDULER_NO_TASK == rh->timeout_task)
{
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: Adjusting timeout\n", rh->id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC-%llu: Adjusting timeout to %s/2\n",
+ rh->id,
+ GNUNET_STRINGS_relative_time_to_string (rh->timeout, GNUNET_YES));
/*
* Set timeout for authority lookup phase to 1/2
*/
- rh->timeout_task = GNUNET_SCHEDULER_add_delayed(
- GNUNET_TIME_relative_divide(rh->timeout, 2),
- &handle_lookup_timeout,
- rh);
+ rh->timeout_task = GNUNET_SCHEDULER_add_delayed (
+ GNUNET_TIME_relative_divide (rh->timeout, 2),
+ &handle_lookup_timeout,
+ rh);
}
- //rh->timeout_task = GNUNET_SCHEDULER_add_delayed (DHT_LOOKUP_TIMEOUT,
- // &dht_lookup_timeout,
- // rh);
rh->timeout_cont = &dht_lookup_timeout;
rh->timeout_cont_cls = rh;
}
GNUNET_CONTAINER_heap_get_size (dht_lookup_heap))
{
rh_heap_root = GNUNET_CONTAINER_heap_remove_root (dht_lookup_heap);
- GNUNET_DHT_get_stop(rh_heap_root->get_handle);
+ GNUNET_DHT_get_stop (rh_heap_root->get_handle);
rh_heap_root->get_handle = NULL;
rh_heap_root->dht_heap_node = NULL;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_REC-%llu: Replacing oldest background query for %s\n",
rh->id, rh_heap_root->name);
- rh_heap_root->proc(rh_heap_root->proc_cls,
- rh_heap_root,
- 0,
- NULL);
+ rh_heap_root->proc (rh_heap_root->proc_cls,
+ rh_heap_root,
+ 0,
+ NULL);
}
rh->dht_heap_node = GNUNET_CONTAINER_heap_insert (dht_lookup_heap,
- rh,
- GNUNET_TIME_absolute_get().abs_value);
+ rh,
+ GNUNET_TIME_absolute_get ().abs_value_us);
}
- xquery = htonl(rlh->record_type);
+ xquery = htonl (rlh->record_type);
- GNUNET_assert(rh->get_handle == NULL);
- rh->get_handle = GNUNET_DHT_get_start(dht_handle,
- GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
- &lookup_key,
- DHT_GNS_REPLICATION_LEVEL,
- GNUNET_DHT_RO_NONE,
- &xquery,
- sizeof(xquery),
- &process_record_result_dht,
- rh);
+ GNUNET_assert (rh->get_handle == NULL);
+ rh->get_handle = GNUNET_DHT_get_start (dht_handle,
+ GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
+ &lookup_key,
+ DHT_GNS_REPLICATION_LEVEL,
+ GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
+ &xquery,
+ sizeof (xquery),
+ &process_record_result_dht,
+ rh);
}
*/
static void
process_record_result_ns (void* cls,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *key,
+ 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 ResolverHandle *rh;
- struct RecordLookupHandle *rlh;
+ struct ResolverHandle *rh = cls;
+ struct RecordLookupHandle *rlh = rh->proc_cls;
struct GNUNET_TIME_Relative remaining_time;
struct GNUNET_CRYPTO_ShortHashCode zone;
struct GNUNET_TIME_Absolute et;
unsigned int i;
- rh = (struct ResolverHandle *) cls;
- rlh = (struct RecordLookupHandle *)rh->proc_cls;
-
rh->namestore_task = NULL;
- GNUNET_CRYPTO_short_hash(key,
- sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &zone);
+ GNUNET_CRYPTO_short_hash (key,
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey),
+ &zone);
remaining_time = GNUNET_TIME_absolute_get_remaining (expiration);
-
-
-
rh->status = 0;
-
- if (name != NULL)
+ if (NULL != name)
{
rh->status |= RSL_RECORD_EXISTS;
-
- if (remaining_time.rel_value == 0)
- {
+ if (remaining_time.rel_value_us == 0)
rh->status |= RSL_RECORD_EXPIRED;
- }
}
-
- if (rd_count == 0)
+ if (0 == rd_count)
{
/**
* Lookup terminated and no results
return;
}
- else
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC-%llu: Processing additional result %s from namestore\n",
+ rh->id, name);
+ for (i = 0; i < rd_count;i++)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: Processing additional result %s from namestore\n",
- rh->id, name);
- for (i=0; i<rd_count;i++)
- {
- if (rd[i].record_type != rlh->record_type)
- continue;
-
- if (ignore_pending_records &&
- (rd[i].flags & GNUNET_NAMESTORE_RF_PENDING))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: Record %s is awaiting user confirmation. Skipping\n",
- rh->id, name);
- continue;
- }
+ if (rd[i].record_type != rlh->record_type)
+ continue;
- GNUNET_break (0 == (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
- et.abs_value = rd[i].expiration_time;
- if ((GNUNET_TIME_absolute_get_remaining (et)).rel_value
- == 0)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: This record is expired. Skipping\n",
- rh->id);
- continue;
- }
- rh->answered++;
+ if (ignore_pending_records &&
+ (rd[i].flags & GNUNET_NAMESTORE_RF_PENDING))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC-%llu: Record %s is awaiting user confirmation. Skipping\n",
+ rh->id, name);
+ continue;
}
-
- /**
- * no answers found
- */
- if (rh->answered == 0)
+
+ //FIXME: eh? do I have to handle this here?
+ GNUNET_break (0 == (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
+ et.abs_value_us = rd[i].expiration_time;
+ if (0 == (GNUNET_TIME_absolute_get_remaining (et)).rel_value_us)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: No answers found. This is odd!\n", rh->id);
- rh->proc(rh->proc_cls, rh, 0, NULL);
- return;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC-%llu: This record is expired. Skipping\n",
+ rh->id);
+ continue;
}
+ rh->answered++;
+ }
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: Found %d answer(s) to query in %d records!\n",
- rh->id, rh->answered, rd_count);
-
- rh->proc(rh->proc_cls, rh, rd_count, rd);
+ /**
+ * no answers found
+ */
+ if (0 == rh->answered)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC-%llu: No answers found. This is odd!\n", rh->id);
+ rh->proc(rh->proc_cls, rh, 0, NULL);
+ return;
}
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC-%llu: Found %d answer(s) to query in %d records!\n",
+ rh->id, rh->answered, rd_count);
+ rh->proc(rh->proc_cls, rh, rd_count, rd);
}
+#ifndef WINDOWS
/**
* VPN redirect result callback
*
process_record_result_vpn (void* cls, int af, const void *address)
{
struct ResolverHandle *rh = cls;
- struct RecordLookupHandle *rlh;
+ struct RecordLookupHandle *rlh = rh->proc_cls;
struct GNUNET_NAMESTORE_RecordData rd;
- rlh = (struct RecordLookupHandle *)rh->proc_cls;
-
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_REC_VPN-%llu: Got answer from VPN to query!\n",
rh->id);
- if (af == AF_INET)
+ if (AF_INET == af)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_REC-%llu: Answer is IPv4!\n",
rh->id);
- if (rlh->record_type != GNUNET_GNS_RECORD_A)
+ if (GNUNET_DNSPARSER_TYPE_A != rlh->record_type)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_REC-%llu: Requested record is not IPv4!\n",
rh->proc (rh->proc_cls, rh, 0, NULL);
return;
}
- rd.record_type = GNUNET_GNS_RECORD_A;
+ rd.record_type = GNUNET_DNSPARSER_TYPE_A;
rd.expiration_time = UINT64_MAX; /* FIXME: should probably pick something shorter... */
rd.data = address;
rd.data_size = sizeof (struct in_addr);
rh->proc (rh->proc_cls, rh, 1, &rd);
return;
}
- else if (af == AF_INET6)
+ else if (AF_INET6 == af)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_REC-%llu: Answer is IPv6!\n",
rh->id);
- if (rlh->record_type != GNUNET_GNS_RECORD_AAAA)
+ if (GNUNET_DNSPARSER_TYPE_AAAA != rlh->record_type)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_REC-%llu: Requested record is not IPv6!\n",
rh->proc (rh->proc_cls, rh, 0, NULL);
return;
}
- rd.record_type = GNUNET_GNS_RECORD_AAAA;
+ rd.record_type = GNUNET_DNSPARSER_TYPE_AAAA;
rd.expiration_time = UINT64_MAX; /* FIXME: should probably pick something shorter... */
rd.data = address;
rd.data_size = sizeof (struct in6_addr);
rh->id);
rh->proc (rh->proc_cls, rh, 0, NULL);
}
-
-
+#endif
/**
unsigned int rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd)
{
- struct RecordLookupHandle* rlh = (struct RecordLookupHandle*) cls;
+ struct RecordLookupHandle* rlh = cls;
- if (rd_count == 0)
+ if (0 == rd_count)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_REC_VPN-%llu: VPN returned no records. (status: %d)!\n",
/* results found yay */
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC_VPN-%llu: Record resolved from VPN!", rh->id);
+ "GNS_PHASE_REC_VPN-%llu: Record resolved from VPN!\n",
+ rh->id);
finish_lookup(rh, rlh, rd_count, rd);
}
/**
- * Sends a UDP dns query to a nameserver specified in the rh
- *
- * @param rh the resolver handle
+ * The final phase of resoution.
+ * We found a NS RR and want to resolve via DNS
+ *
+ * @param rh the pending lookup handle
+ * @param rd_count length of record data
+ * @param rd record data containing VPN RR
*/
static void
-send_dns_packet (struct ResolverHandle *rh);
-
-
-static void
-handle_dns_resolver (void *cls,
- const struct sockaddr *addr,
- socklen_t addrlen)
+resolve_record_dns (struct ResolverHandle *rh,
+ unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd)
{
- struct ResolverHandle *rh = cls;
struct RecordLookupHandle *rlh = rh->proc_cls;
- struct GNUNET_NAMESTORE_RecordData rd;
- struct sockaddr_in *sai;
- struct sockaddr_in6 *sai6;
+ struct GNUNET_DNSPARSER_Query query;
+ struct GNUNET_DNSPARSER_Packet packet;
+ struct GNUNET_DNSPARSER_Flags flags;
+ struct in_addr dnsip;
+ struct sockaddr_in addr;
+ struct sockaddr *sa;
+ unsigned int i;
- if (NULL == addr)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "No address found in DNS!\n");
- finish_lookup (rh, rlh, 0, NULL);
- return;
- }
+ memset (&packet, 0, sizeof (struct GNUNET_DNSPARSER_Packet));
+ memset (rh->dns_name, 0, sizeof (rh->dns_name));
- if (addrlen == sizeof (struct sockaddr_in))
+ /* We cancel here as to not include the ns lookup in the timeout */
+ if (GNUNET_SCHEDULER_NO_TASK != rh->timeout_task)
{
- sai = (struct sockaddr_in*) addr;
- rd.record_type = GNUNET_GNS_RECORD_A;
- rd.data_size = sizeof (struct in_addr);
- rd.data = &sai->sin_addr;
+ GNUNET_SCHEDULER_cancel(rh->timeout_task);
+ rh->timeout_task = GNUNET_SCHEDULER_NO_TASK;
}
- else
+ /* Start shortening */
+ if ((NULL != rh->priv_key) &&
+ (GNUNET_YES == is_canonical (rh->name)))
{
- sai6 = (struct sockaddr_in6*) addr;
- rd.record_type = GNUNET_GNS_RECORD_AAAA;
- rd.data_size = sizeof (struct in6_addr);
- rd.data = &sai6->sin6_addr;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC_DNS-%llu: Trying to shorten authority chain\n",
+ rh->id);
+ start_shorten (rh->authority_chain_head,
+ rh->priv_key);
}
-
- rd.expiration_time = UINT64_MAX; /* FIXME: should probably pick something shorter */
- rd.flags = 0;
- finish_lookup (rh, rlh, 1, &rd);
-
-}
-
-/**
- * Resolve DNS name via local stub resolver
- *
- * @param rh the resolver handle
- */
-static void
-resolve_dns_name (struct ResolverHandle *rh)
-{
- struct RecordLookupHandle *rlh = rh->proc_cls;
- int af;
-
- if ((rlh->record_type != GNUNET_GNS_RECORD_A) &&
- (rlh->record_type != GNUNET_GNS_RECORD_AAAA))
+ for (i = 0; i < rd_count; i++)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Can only resolve A/AAAA via stub... abort\n");
- finish_lookup (rh, rlh, 0, NULL);
- return;
+ /* Synthesize dns name */
+ if (GNUNET_DNSPARSER_TYPE_NS == rd[i].record_type)
+ {
+ strcpy (rh->dns_zone, (char*)rd[i].data);
+ if (0 == strcmp (rh->name, ""))
+ strcpy (rh->dns_name, (char*)rd[i].data);
+ else
+ sprintf (rh->dns_name, "%s.%s", rh->name, (char*)rd[i].data);
+ }
+ /* The glue */
+ if (GNUNET_DNSPARSER_TYPE_A == rd[i].record_type)
+ /* need to use memcpy as .data may be unaligned */
+ memcpy (&dnsip, rd[i].data, sizeof (dnsip));
}
-
- if (rlh->record_type == GNUNET_GNS_RECORD_A)
- af = AF_INET;
- else
- af = AF_INET6;
-
- //GNUNET_RESOLVER_connect (cfg); FIXME into init
-
- rh->dns_resolver_handle = GNUNET_RESOLVER_ip_get (rh->dns_name,
- af,
- rh->timeout,
- &handle_dns_resolver,
- rh);
-}
-
-
-/**
- * Read DNS udp packet from socket
- *
- * @param cls the resolver handle
- * @param tc task context
- */
-static void
-read_dns_response (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct ResolverHandle *rh = cls;
- struct RecordLookupHandle *rlh = rh->proc_cls;
- char buf[UINT16_MAX];
- ssize_t r;
- struct sockaddr_in addr;
- socklen_t addrlen;
- struct GNUNET_DNSPARSER_Packet *packet;
- struct GNUNET_NAMESTORE_RecordData rd;
- int found_delegation = GNUNET_NO;
- int found_cname = GNUNET_NO;
- char* delegation_name = NULL;
- int zone_offset = 0;
- int i;
-
- rh->dns_read_task = GNUNET_SCHEDULER_NO_TASK;
- if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY))
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC_DNS-%llu: Looking up `%s' from `%s'\n",
+ rh->id,
+ rh->dns_name,
+ inet_ntoa (dnsip));
+ rh->dns_sock = GNUNET_NETWORK_socket_create (AF_INET, SOCK_DGRAM, 0);
+ if (NULL == rh->dns_sock)
{
- /* timeout or shutdown */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Terminating DNS query %d\n", tc->reason);
+ "GNS_PHASE_REC_DNS-%llu: Error creating udp socket for dns!\n",
+ rh->id);
finish_lookup (rh, rlh, 0, NULL);
return;
}
- addrlen = sizeof (addr);
- r = GNUNET_NETWORK_socket_recvfrom (rh->dns_sock,
- buf, sizeof (buf),
- (struct sockaddr*) &addr,
- &addrlen);
-
- if (-1 == r)
+ memset (&addr, 0, sizeof (struct sockaddr_in));
+ sa = (struct sockaddr *) &addr;
+ sa->sa_family = AF_INET;
+ if (GNUNET_OK != GNUNET_NETWORK_socket_bind (rh->dns_sock,
+ sa,
+ sizeof (struct sockaddr_in),
+ 0))
{
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "recvfrom");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC_DNS-%llu: Error binding UDP socket for DNS lookup!\n",
+ rh->id);
finish_lookup (rh, rlh, 0, NULL);
return;
}
-
- packet = GNUNET_DNSPARSER_parse (buf, r);
-
- if (NULL == packet)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Failed to parse DNS reply!\n");
- finish_lookup (rh, rlh, 0, NULL);
- return;
- }
-
- for (i = 0; i < packet->num_answers; i++)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Got record type %d (want %d)\n",
- packet->answers[i].type,
- rlh->record_type);
- /* http://tools.ietf.org/html/rfc1034#section-3.6.2 */
- if (packet->answers[i].type == GNUNET_GNS_RECORD_CNAME)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "CNAME... restarting query with %s\n",
- packet->answers[i].data.hostname
- );
- strcpy (rh->dns_name, packet->answers[i].data.hostname);
- found_cname = GNUNET_YES;
- //send_dns_packet (rh);
- //GNUNET_DNSPARSER_free_packet (packet);
- continue;
- }
-
- if ((packet->answers[i].type == rlh->record_type) &&
- (0 == strcmp (packet->answers[i].name, rh->dns_name)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Found record!\n");
- rd.data = packet->answers[i].data.raw.data;
- rd.data_size = packet->answers[i].data.raw.data_len;
- rd.record_type = packet->answers[i].type;
- rd.flags = 0;
- rd.expiration_time = packet->answers[i].expiration_time.abs_value;
- finish_lookup (rh, rlh, 1, &rd);
- GNUNET_DNSPARSER_free_packet (packet);
- return;
- }
- }
-
- if (GNUNET_YES == found_cname)
- {
- zone_offset = strlen (rh->dns_name) - strlen (rh->dns_zone) - 1;
-
- if (0 > zone_offset)
- zone_offset = 0;
-
- /* restart query with CNAME */
- if (0 == strcmp (rh->dns_name+zone_offset, rh->dns_zone))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Asking same server for %s\n", rh->dns_name);
- send_dns_packet (rh);
- }
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Trying system resolver for %s\n", rh->dns_name);
- resolve_dns_name (rh);
- }
-
- GNUNET_DNSPARSER_free_packet (packet);
- return;
- }
-
- for (i = 0; i < packet->num_authority_records; i++)
- {
-
- if (packet->authority_records[i].type == GNUNET_GNS_RECORD_NS)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Found NS delegation!\n");
- found_delegation = GNUNET_YES;
- delegation_name = packet->authority_records[i].data.hostname;
- break;
- }
- }
-
- for (i = 0; i < packet->num_additional_records; i++)
- {
- if (found_delegation == GNUNET_NO)
- break;
-
- if ((packet->additional_records[i].type == GNUNET_GNS_RECORD_A) &&
- (0 == strcmp (packet->additional_records[i].name, delegation_name)))
- {
- GNUNET_assert (sizeof (struct in_addr) ==
- packet->authority_records[i].data.raw.data_len);
-
- rh->dns_addr.sin_addr =
- *((struct in_addr*)packet->authority_records[i].data.raw.data);
- send_dns_packet (rh);
- GNUNET_DNSPARSER_free_packet (packet);
- return;
- }
- }
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Nothing useful in DNS reply!\n");
- finish_lookup (rh, rlh, 0, NULL);
- GNUNET_DNSPARSER_free_packet (packet);
- return;
-}
-
-/**
- * Sends a UDP dns query to a nameserver specified in the rh
- *
- * @param rh the request handle
- */
-static void
-send_dns_packet (struct ResolverHandle *rh)
-{
- struct GNUNET_NETWORK_FDSet *rset = GNUNET_NETWORK_fdset_create ();
- GNUNET_NETWORK_fdset_set (rset, rh->dns_sock);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending %dbyte DNS query\n",
- rh->dns_raw_packet_size);
-
- GNUNET_NETWORK_socket_sendto (rh->dns_sock,
- rh->dns_raw_packet,
- rh->dns_raw_packet_size,
- (struct sockaddr*)&rh->dns_addr,
- sizeof (struct sockaddr_in));
-
- rh->dns_read_task = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- rh->timeout, //FIXME less?
- rset,
- NULL,
- &read_dns_response,
- rh);
-
- GNUNET_NETWORK_fdset_destroy (rset);
-
-}
-
-/**
- * The final phase of resoution.
- * We found a NS RR and want to resolve via DNS
- *
- * @param rh the pending lookup handle
- * @param rd_count length of record data
- * @param rd record data containing VPN RR
- */
-static void
-resolve_record_dns (struct ResolverHandle *rh,
- int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
-{
- struct GNUNET_DNSPARSER_Query query;
- struct GNUNET_DNSPARSER_Packet packet;
- struct GNUNET_DNSPARSER_Flags flags;
- struct in_addr dnsip;
- struct sockaddr_in addr;
- struct sockaddr *sa;
- int i;
- struct RecordLookupHandle *rlh = rh->proc_cls;
-
- memset (&packet, 0, sizeof (struct GNUNET_DNSPARSER_Packet));
-
- /* We cancel here as to not include the ns lookup in the timeout */
- if (rh->timeout_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel(rh->timeout_task);
- rh->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- }
- /* Start shortening */
- if ((rh->priv_key != NULL) && is_canonical (rh->name))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC_DNS-%llu: Trying to shorten authority chain\n",
- rh->id);
- start_shorten (rh->authority_chain_tail,
- rh->priv_key);
- }
-
- for (i = 0; i < rd_count; i++)
- {
- /* Synthesize dns name */
- if (rd[i].record_type == GNUNET_GNS_RECORD_NS)
- {
- strcpy (rh->dns_zone, (char*)rd[i].data);
- if (0 == strcmp (rh->name, ""))
- strcpy (rh->dns_name, (char*)rd[i].data);
- else
- sprintf (rh->dns_name, "%s.%s", rh->name, (char*)rd[i].data);
- }
- /* The glue */
- if (rd[i].record_type == GNUNET_GNS_RECORD_A)
- dnsip = *((struct in_addr*)rd[i].data);
- }
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC_DNS-%llu: Looking up %s from %s\n",
- rh->id,
- rh->dns_name,
- inet_ntoa (dnsip));
- rh->dns_sock = GNUNET_NETWORK_socket_create (AF_INET, SOCK_DGRAM, 0);
- if (rh->dns_sock == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC_DNS-%llu: Error creating udp socket for dns!\n",
- rh->id);
- finish_lookup (rh, rlh, 0, NULL);
- return;
- }
-
- memset (&addr, 0, sizeof (struct sockaddr_in));
- sa = (struct sockaddr *) &addr;
- sa->sa_family = AF_INET;
- if (GNUNET_OK != GNUNET_NETWORK_socket_bind (rh->dns_sock,
- sa,
- sizeof (struct sockaddr_in)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC_DNS-%llu: Error binding udp socket for dns!\n",
- rh->id);
- finish_lookup (rh, rlh, 0, NULL);
- return;
- }
-
- /*TODO create dnsparser query, serialize, sendto, handle reply*/
query.name = rh->dns_name;
query.type = rlh->record_type;
query.class = GNUNET_DNSPARSER_CLASS_INTERNET;
#if HAVE_SOCKADDR_IN_SIN_LEN
rh->dns_addr.sin_len = (u_char) sizeof (struct sockaddr_in);
#endif
-
send_dns_packet (rh);
}
*/
static void
resolve_record_vpn (struct ResolverHandle *rh,
- int rd_count,
+ unsigned int rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd)
{
struct RecordLookupHandle *rlh = rh->proc_cls;
int af;
/* We cancel here as to not include the ns lookup in the timeout */
- if (rh->timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ if (GNUNET_SCHEDULER_NO_TASK != rh->timeout_task)
{
GNUNET_SCHEDULER_cancel(rh->timeout_task);
rh->timeout_task = GNUNET_SCHEDULER_NO_TASK;
}
/* Start shortening */
- if ((rh->priv_key != NULL) && is_canonical (rh->name))
+ if ((NULL != rh->priv_key) &&
+ (GNUNET_YES == is_canonical (rh->name)))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_REC_VPN-%llu: Trying to shorten authority chain\n",
rh->id);
- start_shorten (rh->authority_chain_tail,
+ start_shorten (rh->authority_chain_head,
rh->priv_key);
}
vpn = (struct vpn_data*)rd->data;
-
-
GNUNET_CRYPTO_hash ((char*)&vpn[1],
strlen ((char*)&vpn[1]) + 1,
&serv_desc);
(char*)&vpn[1],
GNUNET_h2s (&serv_desc));
rh->proc = &handle_record_vpn;
-
- if (NULL == vpn_handle)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC_VPN-%llu: VPN not connected!\n",
- rh->id);
- finish_lookup (rh, rh->proc_cls, 0, NULL);
- return;
- }
-
- if (rlh->record_type == GNUNET_GNS_RECORD_A)
+ if (GNUNET_DNSPARSER_TYPE_A == rlh->record_type)
af = AF_INET;
else
af = AF_INET6;
-
- //FIXME timeout??
+#ifndef WINDOWS
if (NULL == vpn_handle)
{
vpn_handle = GNUNET_VPN_connect (cfg);
}
}
-
rh->vpn_handle = GNUNET_VPN_redirect_to_peer (vpn_handle,
af, ntohs (vpn->proto),
(struct GNUNET_PeerIdentity *)&vpn->peer,
GNUNET_TIME_UNIT_FOREVER_ABS, //FIXME
&process_record_result_vpn,
rh);
-
+#else
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Error connecting to VPN (not available on W32 yet)\n");
+ finish_lookup (rh, rh->proc_cls, 0, NULL);
+#endif
}
+
/**
* The final phase of resolution.
* rh->name is a name that is canonical and we do not have a delegation.
static void
resolve_record_ns(struct ResolverHandle *rh)
{
- struct RecordLookupHandle *rlh = (struct RecordLookupHandle *)rh->proc_cls;
+ struct RecordLookupHandle *rlh = rh->proc_cls;
/* We cancel here as to not include the ns lookup in the timeout */
- if (rh->timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ if (GNUNET_SCHEDULER_NO_TASK != rh->timeout_task)
{
GNUNET_SCHEDULER_cancel(rh->timeout_task);
rh->timeout_task = GNUNET_SCHEDULER_NO_TASK;
}
/* Start shortening */
- if ((rh->priv_key != NULL) && is_canonical (rh->name))
+ if ((NULL != rh->priv_key) &&
+ (GNUNET_YES == is_canonical (rh->name)))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_REC-%llu: Trying to shorten authority chain\n",
rh->id);
- start_shorten (rh->authority_chain_tail,
+ start_shorten (rh->authority_chain_head,
rh->priv_key);
}
}
-
/**
* Handle timeout for DHT requests
*
* @param tc the task context
*/
static void
-dht_authority_lookup_timeout(void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+dht_authority_lookup_timeout (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct ResolverHandle *rh = cls;
struct RecordLookupHandle *rlh = rh->proc_cls;
- char new_name[MAX_DNS_NAME_LENGTH];
+ char new_name[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_DHT-%llu: dht lookup for query %s (%llus)timed out.\n",
- rh->id, rh->authority_name, rh->timeout.rel_value);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_DHT-%llu: dht lookup for query %s (%s) timed out.\n",
+ rh->id, rh->authority_name,
+ GNUNET_STRINGS_relative_time_to_string (rh->timeout,
+ GNUNET_YES));
rh->status |= RSL_TIMED_OUT;
-
rh->timeout_task = GNUNET_SCHEDULER_NO_TASK;
-
if (NULL != rh->get_handle)
+ {
GNUNET_DHT_get_stop (rh->get_handle);
-
- rh->get_handle = NULL;
-
- if (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)
+ rh->get_handle = NULL;
+ }
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_DHT-%llu: Got shutdown\n",
- rh->id);
- rh->proc(rh->proc_cls, rh, 0, NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_DHT-%llu: Got shutdown\n",
+ rh->id);
+ rh->proc (rh->proc_cls, rh, 0, NULL);
return;
}
-
- if (strcmp(rh->name, "") == 0)
+ if (0 == strcmp (rh->name, ""))
{
/*
* promote authority back to name and try to resolve record
*/
- strcpy(rh->name, rh->authority_name);
- rh->proc(rh->proc_cls, rh, 0, NULL);
+ strcpy (rh->name, rh->authority_name);
+ rh->proc (rh->proc_cls, rh, 0, NULL);
return;
}
/**
* Start resolution in bg
*/
- GNUNET_snprintf(new_name, MAX_DNS_NAME_LENGTH,
- "%s.%s.%s", rh->name, rh->authority_name, GNUNET_GNS_TLD);
- //strcpy(new_name, rh->name);
- //strcpy(new_name+strlen(new_name), ".");
- //memcpy(new_name+strlen(new_name), GNUNET_GNS_TLD, strlen(GNUNET_GNS_TLD));
-
- strcpy(rh->name, new_name);
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_DHT-%llu: Starting background query for %s type %d\n",
- rh->id, rh->name, rlh->record_type);
-
- gns_resolver_lookup_record(rh->authority,
- rh->private_local_zone,
- rlh->record_type,
- new_name,
- NULL,
- GNUNET_TIME_UNIT_FOREVER_REL,
- GNUNET_NO,
- &background_lookup_result_processor,
- NULL);
-
- rh->proc(rh->proc_cls, rh, 0, NULL);
+ GNUNET_snprintf (new_name, GNUNET_DNSPARSER_MAX_NAME_LENGTH,
+ "%s.%s.%s",
+ rh->name, rh->authority_name, GNUNET_GNS_TLD);
+ strcpy (rh->name, new_name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_DHT-%llu: Starting background query for %s type %d\n",
+ rh->id, rh->name,
+ rlh->record_type);
+ gns_resolver_lookup_record (rh->authority,
+ rh->private_local_zone,
+ rlh->record_type,
+ new_name,
+ NULL,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_NO,
+ &background_lookup_result_processor,
+ NULL);
+ rh->proc (rh->proc_cls, rh, 0, NULL);
}
-/* Prototype */
-static void resolve_delegation_dht(struct ResolverHandle *rh);
-
-/* Prototype */
-static void resolve_delegation_ns(struct ResolverHandle *rh);
-
-
-/**
- * Namestore resolution for delegation finished. Processing result.
- *
- * @param cls the closure
- * @param rh resolver handle
- * @param rd_count number of results (always 0)
- * @param rd record data (always NULL)
- */
-static void
-handle_delegation_ns(void* cls, struct ResolverHandle *rh,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd);
-
/**
* This is a callback function that checks for key revocation
*/
static void
process_pkey_revocation_result_ns (void *cls,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *key,
- struct GNUNET_TIME_Absolute expiration,
- const char *name,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_RsaSignature *signature)
+ 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 ResolverHandle *rh = cls;
struct GNUNET_TIME_Relative remaining_time;
for (i = 0; i < rd_count; i++)
{
- if (rd[i].record_type == GNUNET_GNS_RECORD_REV)
+ if (GNUNET_NAMESTORE_TYPE_REV == rd[i].record_type)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_REV-%llu: Zone has been revoked.\n",
}
}
- if ((name == NULL) ||
- (remaining_time.rel_value == 0))
+ if ((NULL == name) ||
+ (0 == remaining_time.rel_value_us))
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_REV-%llu: + Records don't exist or are expired.\n",
rh->id, name);
- if (rh->timeout.rel_value != GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
+ if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != rh->timeout.rel_value_us)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_REV-%llu: Starting background lookup for %s type %d\n",
- rh->id, "+.gnunet", GNUNET_GNS_RECORD_REV);
+ rh->id, "+.gads", GNUNET_NAMESTORE_TYPE_REV);
gns_resolver_lookup_record(rh->authority,
rh->private_local_zone,
- GNUNET_GNS_RECORD_REV,
+ GNUNET_NAMESTORE_TYPE_REV,
GNUNET_GNS_TLD,
NULL,
GNUNET_TIME_UNIT_FOREVER_REL,
rh->proc (rh->proc_cls, rh, rh->rd_count, &rh->rd);
else
resolve_delegation_ns (rh);
-
- return;
}
* @param success GNUNET_OK on success
* @param emsg the error message. NULL if SUCCESS==GNUNET_OK
*/
-void
+static void
on_namestore_delegation_put_result(void *cls,
int32_t success,
const char *emsg)
"GNS_NS: Error putting records into namestore: %s\n", emsg);
}
+
/**
* Function called when we get a result from the dht
* for our query. Recursively tries to resolve authorities
* @param data the record data
*/
static void
-process_delegation_result_dht(void* cls,
- struct GNUNET_TIME_Absolute exp,
- const struct GNUNET_HashCode * key,
- const struct GNUNET_PeerIdentity *get_path,
- unsigned int get_path_length,
- const struct GNUNET_PeerIdentity *put_path,
- unsigned int put_path_length,
- enum GNUNET_BLOCK_Type type,
- size_t size, const void *data)
+process_delegation_result_dht (void* cls,
+ struct GNUNET_TIME_Absolute exp,
+ const struct GNUNET_HashCode * key,
+ const struct GNUNET_PeerIdentity *get_path,
+ unsigned int get_path_length,
+ const struct GNUNET_PeerIdentity *put_path,
+ unsigned int put_path_length,
+ enum GNUNET_BLOCK_Type type,
+ size_t size, const void *data)
{
- struct ResolverHandle *rh;
- struct GNSNameRecordBlock *nrb;
+ struct ResolverHandle *rh = cls;
+ const struct GNSNameRecordBlock *nrb = data;
+ const char* rd_data;
uint32_t num_records;
- char* name = NULL;
- char* rd_data = (char*) data;
- int i;
+ const char* name;
+ uint32_t i;
int rd_size;
- struct GNUNET_CRYPTO_ShortHashCode zone, name_hash;
- struct GNUNET_HashCode zone_hash_double, name_hash_double;
-
- rh = (struct ResolverHandle *)cls;
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_DHT-%llu: Got DHT result\n", rh->id);
+ struct GNUNET_CRYPTO_ShortHashCode zone;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_DHT-%llu: Got DHT result\n",
+ rh->id);
if (data == NULL)
return;
-
- nrb = (struct GNSNameRecordBlock*)data;
-
- /* stop dht lookup and timeout task */
+ /* stop dht lookup and timeout task */
GNUNET_DHT_get_stop (rh->get_handle);
-
rh->get_handle = NULL;
-
if (rh->dht_heap_node != NULL)
{
GNUNET_CONTAINER_heap_remove_node(rh->dht_heap_node);
}
num_records = ntohl(nrb->rd_count);
- name = (char*)&nrb[1];
+ name = (const char*) &nrb[1];
{
struct GNUNET_NAMESTORE_RecordData rd[num_records];
struct NamestoreBGTask *ns_heap_root;
struct NamestoreBGTask *namestore_bg_task;
- rd_data += strlen(name) + 1 + sizeof(struct GNSNameRecordBlock);
- rd_size = size - strlen(name) - 1 - sizeof(struct GNSNameRecordBlock);
-
+ rd_data = name + strlen(name) + 1;
+ rd_size = size - strlen(name) - 1 - sizeof (struct GNSNameRecordBlock);
if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (rd_size,
rd_data,
num_records,
rh->id, name, rh->authority_name);
for (i=0; i<num_records; i++)
{
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_DHT-%llu: Got name: %s (wanted %s)\n",
- rh->id, name, rh->authority_name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_DHT-%llu: Got name: %s (wanted %s)\n",
+ rh->id, name, rh->authority_name);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_DHT-%llu: Got type: %d (wanted %d)\n",
- rh->id, rd[i].record_type, GNUNET_GNS_RECORD_PKEY);
+ rh->id, rd[i].record_type, GNUNET_NAMESTORE_TYPE_PKEY);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_DHT-%llu: Got data length: %d\n",
rh->id, rd[i].data_size);
"GNS_PHASE_DELEGATE_DHT-%llu: Got flag %d\n",
rh->id, rd[i].flags);
- if ((rd[i].record_type == GNUNET_GNS_RECORD_VPN) ||
- (rd[i].record_type == GNUNET_GNS_RECORD_NS) ||
- (rd[i].record_type == GNUNET_GNS_RECORD_CNAME))
+ if ((GNUNET_NAMESTORE_TYPE_VPN == rd[i].record_type) ||
+ (GNUNET_DNSPARSER_TYPE_NS == rd[i].record_type) ||
+ (GNUNET_DNSPARSER_TYPE_CNAME == rd[i].record_type))
{
/**
* This is a VPN,NS,CNAME entry. Let namestore handle this after caching
*/
- if (strcmp(rh->name, "") == 0)
+ if (0 == strcmp(rh->name, ""))
strcpy(rh->name, rh->authority_name);
else
- GNUNET_snprintf(rh->name, MAX_DNS_NAME_LENGTH, "%s.%s",
+ GNUNET_snprintf(rh->name, GNUNET_DNSPARSER_MAX_NAME_LENGTH, "%s.%s",
rh->name, rh->authority_name); //FIXME ret
rh->answered = 1;
break;
}
- if ((strcmp(name, rh->authority_name) == 0) &&
- (rd[i].record_type == GNUNET_GNS_RECORD_PKEY))
+ if ((0 == strcmp(name, rh->authority_name)) &&
+ (GNUNET_NAMESTORE_TYPE_PKEY == rd[i].record_type))
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_DHT-%llu: Authority found in DHT\n",
}
}
+ GNUNET_GNS_get_zone_from_key (name, key, &zone);
- GNUNET_CRYPTO_short_hash(name, strlen(name), &name_hash);
- GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double);
- GNUNET_CRYPTO_hash_xor(key, &name_hash_double, &zone_hash_double);
- GNUNET_CRYPTO_short_hash_from_truncation (&zone_hash_double, &zone);
-
- /* Save to namestore */
- if (0 != GNUNET_CRYPTO_short_hash_cmp(&rh->authority_chain_tail->zone,
+ /* Save to namestore
+ if (0 != GNUNET_CRYPTO_short_hash_cmp(&rh->authority_chain_head->zone,
&zone))
- {
+ {*/
if (max_allowed_ns_tasks <=
GNUNET_CONTAINER_heap_get_size (ns_task_heap))
{
GNUNET_NAMESTORE_cancel (ns_heap_root->qe);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: Replacing oldest background ns task\n",
+ "GNS_PHASE_DELEGATE_DHT-%llu: Replacing oldest background ns task\n",
rh->id);
}
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_DHT-%llu: Caching record for %s\n",
+ rh->id, name);
namestore_bg_task = GNUNET_malloc (sizeof (struct NamestoreBGTask));
namestore_bg_task->node = GNUNET_CONTAINER_heap_insert (ns_task_heap,
namestore_bg_task,
- GNUNET_TIME_absolute_get().abs_value);
+ GNUNET_TIME_absolute_get().abs_value_us);
namestore_bg_task->qe = GNUNET_NAMESTORE_record_put (namestore_handle,
&nrb->public_key,
name,
&on_namestore_delegation_put_result, //cont
namestore_bg_task); //cls
}
- }
+ //}
- if (rh->answered)
+ if (0 != rh->answered)
{
rh->answered = 0;
/**
"GNS_PHASE_DELEGATE_DHT-%llu: Answer from DHT for %s. Yet to resolve: %s\n",
rh->id, rh->authority_name, rh->name);
- if (strcmp(rh->name, "") == 0)
+ if (0 == strcmp(rh->name, ""))
{
/* Start shortening */
- if ((rh->priv_key != NULL) && is_canonical (rh->name))
+ if ((NULL != rh->priv_key) &&
+ (GNUNET_YES == is_canonical (rh->name)))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_DHT-%llu: Trying to shorten authority chain\n",
rh->id);
- start_shorten (rh->authority_chain_tail,
+ start_shorten (rh->authority_chain_head,
rh->priv_key);
}
}
/* Check for key revocation and delegate */
rh->namestore_task = GNUNET_NAMESTORE_lookup_record (namestore_handle,
&rh->authority,
- "+",
- GNUNET_GNS_RECORD_REV,
+ GNUNET_GNS_MASTERZONE_STR,
+ GNUNET_NAMESTORE_TYPE_REV,
&process_pkey_revocation_result_ns,
rh);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_DHT-%llu: Adding %s back to %s\n",
rh->id, rh->authority_name, rh->name);
- if (strcmp(rh->name, "") == 0)
+ if (0 == strcmp(rh->name, ""))
strcpy(rh->name, rh->authority_name);
else
- GNUNET_snprintf(rh->name, MAX_DNS_NAME_LENGTH, "%s.%s",
+ GNUNET_snprintf(rh->name, GNUNET_DNSPARSER_MAX_NAME_LENGTH, "%s.%s",
rh->name, rh->authority_name); //FIXME ret
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
rh->proc(rh->proc_cls, rh, 0, NULL);
}
+//FIXME maybe define somewhere else?
#define MAX_SOA_LENGTH sizeof(uint32_t)+sizeof(uint32_t)+sizeof(uint32_t)+sizeof(uint32_t)\
- +(MAX_DNS_NAME_LENGTH*2)
-#define MAX_MX_LENGTH sizeof(uint16_t)+MAX_DNS_NAME_LENGTH
-#define MAX_SRV_LENGTH (sizeof(uint16_t)*3)+MAX_DNS_NAME_LENGTH
+ +(GNUNET_DNSPARSER_MAX_NAME_LENGTH*2)
+#define MAX_MX_LENGTH sizeof(uint16_t)+GNUNET_DNSPARSER_MAX_NAME_LENGTH
+#define MAX_SRV_LENGTH (sizeof(uint16_t)*3)+GNUNET_DNSPARSER_MAX_NAME_LENGTH
+/**
+ * Exands a name ending in .+ with the zone of origin.
+ * FIXME: funky api: 'dest' must be large enough to hold
+ * the result; this is a bit yucky...
+ *
+ * @param dest destination buffer
+ * @param src the .+ name
+ * @param repl the string to replace the + with
+ */
static void
-expand_plus(char* dest, char* src, char* repl)
+expand_plus (char* dest,
+ const char* src,
+ const char* repl)
{
char* pos;
- unsigned int s_len = strlen(src)+1;
+ size_t s_len = strlen (src) + 1;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_POSTPROCESS: Got %s to expand with %s\n", src, repl);
-
- if (s_len < 3)
+ //Eh? I guess this is at least strlen ('x.+') == 3 FIXME
+ if (3 > s_len)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_POSTPROCESS: %s to short\n", src);
-
/* no postprocessing */
- memcpy(dest, src, s_len+1);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_POSTPROCESS: %s too short\n", src);
+ memcpy (dest, src, s_len);
return;
}
-
- if (0 == strcmp(src+s_len-3, ".+"))
+ if (0 == strcmp (src + s_len - 3, ".+"))
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_POSTPROCESS: Expanding .+ in %s\n", src);
- memset(dest, 0, s_len+strlen(repl)+strlen(GNUNET_GNS_TLD));
- strcpy(dest, src);
- pos = dest+s_len-2;
- strcpy(pos, repl);
- pos += strlen(repl);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_POSTPROCESS: Expanded to %s\n", dest);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_POSTPROCESS: Expanding .+ in %s\n",
+ src);
+ memset (dest, 0, s_len + strlen (repl) + strlen(GNUNET_GNS_TLD));
+ strcpy (dest, src);
+ pos = dest + s_len - 2;
+ strcpy (pos, repl);
+ pos += strlen (repl);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_POSTPROCESS: Expanded to %s\n",
+ dest);
}
else
{
- memcpy(dest, src, s_len+1);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_POSTPROCESS: No postprocessing for %s\n", src);
+ memcpy (dest, src, s_len);
}
}
+
/**
* finish lookup
*/
unsigned int rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd)
{
- int i;
- char new_rr_data[MAX_DNS_NAME_LENGTH];
+ unsigned int i;
+ char new_rr_data[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
char new_mx_data[MAX_MX_LENGTH];
char new_soa_data[MAX_SOA_LENGTH];
char new_srv_data[MAX_SRV_LENGTH];
char* pos;
unsigned int offset;
- if (rh->timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ if (GNUNET_SCHEDULER_NO_TASK != rh->timeout_task)
{
GNUNET_SCHEDULER_cancel(rh->timeout_task);
rh->timeout_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_CONTAINER_DLL_remove (rlh_head, rlh_tail, rh);
- if (rd_count > 0)
+ if (0 < rd_count)
memcpy(p_rd, rd, rd_count*sizeof(struct GNUNET_NAMESTORE_RecordData));
for (i = 0; i < rd_count; i++)
{
- if (rd[i].record_type != GNUNET_GNS_RECORD_NS &&
- rd[i].record_type != GNUNET_GNS_RECORD_PTR &&
- rd[i].record_type != GNUNET_GNS_RECORD_CNAME &&
- rd[i].record_type != GNUNET_GNS_RECORD_MX &&
- rd[i].record_type != GNUNET_GNS_RECORD_SOA &&
- rd[i].record_type != GNUNET_GNS_RECORD_SRV)
+ if ((GNUNET_DNSPARSER_TYPE_NS != rd[i].record_type) &&
+ (GNUNET_DNSPARSER_TYPE_PTR != rd[i].record_type) &&
+ (GNUNET_DNSPARSER_TYPE_CNAME != rd[i].record_type) &&
+ (GNUNET_DNSPARSER_TYPE_MX != rd[i].record_type) &&
+ (GNUNET_DNSPARSER_TYPE_SOA != rd[i].record_type) &&
+ (GNUNET_DNSPARSER_TYPE_SRV != rd[i].record_type))
{
p_rd[i].data = rd[i].data;
continue;
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_POSTPROCESS: Postprocessing\n");
-
- if (strcmp(rh->name, "+") == 0)
+ if (0 == strcmp(rh->name, GNUNET_GNS_MASTERZONE_STR))
repl_string = rlh->name;
else
repl_string = rlh->name+strlen(rh->name)+1;
offset = 0;
- if (rd[i].record_type == GNUNET_GNS_RECORD_MX)
+ if (GNUNET_DNSPARSER_TYPE_MX == rd[i].record_type)
{
memcpy (new_mx_data, (char*)rd[i].data, sizeof(uint16_t));
- offset = sizeof(uint16_t);
- pos = new_mx_data+offset;
- expand_plus(pos, (char*)rd[i].data+sizeof(uint16_t),
- repl_string);
- offset += strlen(new_mx_data+sizeof(uint16_t))+1;
+ offset = sizeof (uint16_t);
+ pos = new_mx_data + offset;
+ // FIXME: how do we know that 'pos' has enough space for the new name?
+ expand_plus (pos, (char*)rd[i].data+sizeof(uint16_t),
+ repl_string);
+ offset += strlen(new_mx_data+sizeof(uint16_t)) + 1;
p_rd[i].data = new_mx_data;
p_rd[i].data_size = offset;
}
- else if (rd[i].record_type == GNUNET_GNS_RECORD_SRV)
+ else if (GNUNET_DNSPARSER_TYPE_SRV == rd[i].record_type)
{
/*
* Prio, weight and port
new_srv->prio = old_srv->prio;
new_srv->weight = old_srv->weight;
new_srv->port = old_srv->port;
+ // FIXME: how do we know that '&new_srv[1]' has enough space for the new name?
expand_plus((char*)&new_srv[1], (char*)&old_srv[1],
repl_string);
p_rd[i].data = new_srv_data;
p_rd[i].data_size = sizeof (struct srv_data) + strlen ((char*)&new_srv[1]) + 1;
}
- else if (rd[i].record_type == GNUNET_GNS_RECORD_SOA)
+ else if (GNUNET_DNSPARSER_TYPE_SOA == rd[i].record_type)
{
/* expand mname and rname */
old_soa = (struct soa_data*)rd[i].data;
new_soa = (struct soa_data*)new_soa_data;
memcpy (new_soa, old_soa, sizeof (struct soa_data));
+ // FIXME: how do we know that 'new_soa[1]' has enough space for the new name?
expand_plus((char*)&new_soa[1], (char*)&old_soa[1], repl_string);
offset = strlen ((char*)&new_soa[1]) + 1;
+ // FIXME: how do we know that 'new_soa[1]' has enough space for the new name?
expand_plus((char*)&new_soa[1] + offset,
(char*)&old_soa[1] + strlen ((char*)&old_soa[1]) + 1,
repl_string);
else
{
pos = new_rr_data;
+ // FIXME: how do we know that 'rd[i].data' has enough space for the new name?
expand_plus(pos, (char*)rd[i].data, repl_string);
p_rd[i].data_size = strlen(new_rr_data)+1;
p_rd[i].data = new_rr_data;
free_resolver_handle (rh);
}
+
/**
* Process DHT lookup result for record.
*
* @param rd record data
*/
static void
-handle_record_dht(void* cls, struct ResolverHandle *rh,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+handle_record_dht (void* cls, struct ResolverHandle *rh,
+ unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd)
{
- struct RecordLookupHandle* rlh;
+ struct RecordLookupHandle* rlh = cls;
- rlh = (struct RecordLookupHandle*)cls;
- if (rd_count == 0)
+ if (0 == rd_count)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_REC-%llu: No records for %s found in DHT. Aborting\n",
rh->id, rh->name);
/* give up, cannot resolve */
- finish_lookup(rh, rlh, 0, NULL);
+ finish_lookup (rh, rlh, 0, NULL);
return;
}
-
/* results found yay */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_REC-%llu: Record resolved from DHT!", rh->id);
-
- finish_lookup(rh, rlh, rd_count, rd);
-
+ finish_lookup (rh, rlh, rd_count, rd);
}
-
-
/**
* Process namestore lookup result for record.
*
unsigned int rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd)
{
- struct RecordLookupHandle* rlh;
- rlh = (struct RecordLookupHandle*) cls;
+ struct RecordLookupHandle* rlh = cls;
int check_dht = GNUNET_YES;
-
- if (rd_count == 0)
+
+ if (0 != rd_count)
+ {
+ /* results found yay */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC-%llu: Record resolved from namestore!\n", rh->id);
+ finish_lookup (rh, rlh, rd_count, rd);
+ return;
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC-%llu: NS returned no records. (status: %d)!\n",
+ rh->id,
+ rh->status);
+ /**
+ * There are 5 conditions that have to met for us to consult the DHT:
+ * 1. The entry in the DHT is RSL_RECORD_EXPIRED OR
+ * 2. No entry in the NS existed AND
+ * 3. The zone queried is not the local resolver's zone AND
+ * 4. The name that was looked up is '+'
+ * because if it was any other canonical name we either already queried
+ * the DHT for the authority in the authority lookup phase (and thus
+ * would already have an entry in the NS for the record)
+ * 5. We are not in cache only mode
+ */
+ if ((0 != (rh->status & RSL_RECORD_EXPIRED)) &&
+ (0 == (rh->status & RSL_RECORD_EXISTS)) )
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: NS returned no records. (status: %d)!\n",
- rh->id,
- rh->status);
-
- /**
- * There are 5 conditions that have to met for us to consult the DHT:
- * 1. The entry in the DHT is RSL_RECORD_EXPIRED OR
- * 2. No entry in the NS existed AND
- * 3. The zone queried is not the local resolver's zone AND
- * 4. The name that was looked up is '+'
- * because if it was any other canonical name we either already queried
- * the DHT for the authority in the authority lookup phase (and thus
- * would already have an entry in the NS for the record)
- * 5. We are not in cache only mode
- */
- if (((rh->status & RSL_RECORD_EXPIRED) != 0) &&
- ((rh->status & RSL_RECORD_EXISTS) == 0) )
- check_dht = GNUNET_NO;
-
- if (0 != GNUNET_CRYPTO_short_hash_cmp(&rh->authority_chain_head->zone,
- &rh->private_local_zone))
- check_dht = GNUNET_NO;
- if ((strcmp (rh->name, "+") != 0) && (is_srv (rh->name) != 0))
- check_dht = GNUNET_NO;
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC-%llu: Not expired and exists!\n",
+ rh->id);
+ check_dht = GNUNET_NO;
+ }
+
+ if (0 == GNUNET_CRYPTO_short_hash_cmp(&rh->authority_chain_head->zone,
+ &rh->private_local_zone))
+ {
- if (rh->only_cached == GNUNET_YES)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC-%llu: Our zone!\n",
+ rh->id);
+ check_dht = GNUNET_NO;
+ }
+
+ if ((0 != strcmp (rh->name, GNUNET_GNS_MASTERZONE_STR)) && (GNUNET_YES == is_srv (rh->name)))
check_dht = GNUNET_NO;
-
- if (GNUNET_YES == check_dht)
- {
- rh->proc = &handle_record_dht;
- resolve_record_dht(rh);
- return;
- }
- /* give up, cannot resolve */
- finish_lookup(rh, rlh, 0, NULL);
+
+ if (GNUNET_YES == rh->only_cached)
+ check_dht = GNUNET_NO;
+
+ if (GNUNET_YES == check_dht)
+ {
+ rh->proc = &handle_record_dht;
+ resolve_record_dht(rh);
return;
}
-
- /* results found yay */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: Record resolved from namestore!\n", rh->id);
-
- finish_lookup(rh, rlh, rd_count, rd);
-
-
+ /* give up, cannot resolve */
+ finish_lookup (rh, rlh, 0, NULL);
}
* Move one level up in the domain hierarchy and return the
* passed top level domain.
*
+ * FIXME: funky API: not only 'dest' is updated, so is 'name'!
+ *
* @param name the domain
* @param dest the destination where the tld will be put
*/
-void
-pop_tld(char* name, char* dest)
+static void
+pop_tld (char* name, char* dest)
{
uint32_t len;
- if (is_canonical (name))
+ if (GNUNET_YES == is_canonical (name))
{
- strcpy(dest, name);
- strcpy(name, "");
+ strcpy (dest, name);
+ strcpy (name, "");
return;
}
- for (len = strlen(name); len > 0; len--)
+ for (len = strlen(name); 0 < len; len--)
{
if (*(name+len) == '.')
break;
}
//Was canonical?
- if (len == 0)
+ if (0 == len)
return;
-
name[len] = '\0';
-
- strcpy(dest, (name+len+1));
+ strcpy (dest, (name+len+1));
}
-/**
- * Checks if name is in tld
- *
- * @param name the name to check
- * @param tld the TLD to check for
- * @return GNUNET_YES or GNUNET_NO
- */
-int
-is_tld(const char* name, const char* tld)
-{
- int offset = 0;
-
- if (strlen(name) <= strlen(tld))
- {
- return GNUNET_NO;
- }
-
- offset = strlen(name)-strlen(tld);
- if (strcmp(name+offset, tld) != 0)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "%s is not in .%s TLD\n", name, tld);
- return GNUNET_NO;
- }
- return GNUNET_YES;
-}
/**
* DHT resolution for delegation finished. Processing result.
unsigned int rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd)
{
- struct RecordLookupHandle* rlh;
- rlh = (struct RecordLookupHandle*) cls;
+ struct RecordLookupHandle* rlh = cls;
-
- if (strcmp(rh->name, "") == 0)
+ if (0 == strcmp(rh->name, ""))
{
- if ((rlh->record_type == GNUNET_GNS_RECORD_PKEY))
+ if (GNUNET_NAMESTORE_TYPE_PKEY == rlh->record_type)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_DHT-%llu: Resolved queried PKEY via DHT.\n",
/**
* we still have some left
**/
- if (is_canonical(rh->name))
+ if (GNUNET_YES == is_canonical (rh->name))
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_DHT-%llu: Resolving canonical record %s in ns\n",
* @param rh the pending gns query
*/
static void
-resolve_delegation_dht(struct ResolverHandle *rh)
+resolve_delegation_dht (struct ResolverHandle *rh)
{
uint32_t xquery;
- struct GNUNET_CRYPTO_ShortHashCode name_hash;
- struct GNUNET_HashCode name_hash_double;
- struct GNUNET_HashCode zone_hash_double;
struct GNUNET_HashCode lookup_key;
struct ResolverHandle *rh_heap_root;
- pop_tld(rh->name, rh->authority_name);
- GNUNET_CRYPTO_short_hash(rh->authority_name,
- strlen(rh->authority_name),
- &name_hash);
- GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double);
- GNUNET_CRYPTO_short_hash_double(&rh->authority, &zone_hash_double);
- GNUNET_CRYPTO_hash_xor(&name_hash_double, &zone_hash_double, &lookup_key);
-
+ pop_tld (rh->name, rh->authority_name);
+ GNUNET_GNS_get_key_for_record (rh->authority_name,
+ &rh->authority,
+ &lookup_key);
rh->dht_heap_node = NULL;
-
- if (rh->timeout.rel_value != GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
+ if (rh->timeout.rel_value_us != GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us)
{
- //rh->timeout_task = GNUNET_SCHEDULER_add_delayed (DHT_LOOKUP_TIMEOUT,
- // &dht_authority_lookup_timeout,
- // rh);
rh->timeout_cont = &dht_authority_lookup_timeout;
rh->timeout_cont_cls = rh;
}
GNUNET_DHT_get_stop (rh_heap_root->get_handle);
rh_heap_root->get_handle = NULL;
rh_heap_root->dht_heap_node = NULL;
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_DHT-%llu: Replacing oldest background query for %s\n",
- rh->id, rh_heap_root->authority_name);
-
- rh_heap_root->proc(rh_heap_root->proc_cls,
- rh_heap_root,
- 0,
- NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_DHT-%llu: Replacing oldest background query for %s\n",
+ rh->id,
+ rh_heap_root->authority_name);
+ rh_heap_root->proc (rh_heap_root->proc_cls,
+ rh_heap_root,
+ 0,
+ NULL);
}
rh->dht_heap_node = GNUNET_CONTAINER_heap_insert (dht_lookup_heap,
- rh,
- GNUNET_TIME_absolute_get().abs_value);
+ rh,
+ GNUNET_TIME_absolute_get().abs_value_us);
}
-
- xquery = htonl(GNUNET_GNS_RECORD_PKEY);
-
- GNUNET_assert(rh->get_handle == NULL);
- rh->get_handle = GNUNET_DHT_get_start(dht_handle,
- GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
- &lookup_key,
- DHT_GNS_REPLICATION_LEVEL,
- GNUNET_DHT_RO_NONE,
- &xquery,
- sizeof(xquery),
- &process_delegation_result_dht,
- rh);
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Beginning DHT lookup for %s in zone %s for request %llu\n",
+ rh->authority_name,
+ GNUNET_short_h2s (&rh->authority),
+ rh->id);
+ xquery = htonl (GNUNET_NAMESTORE_TYPE_PKEY);
+ GNUNET_assert (rh->get_handle == NULL);
+ rh->get_handle = GNUNET_DHT_get_start (dht_handle,
+ GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
+ &lookup_key,
+ DHT_GNS_REPLICATION_LEVEL,
+ GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
+ &xquery,
+ sizeof(xquery),
+ &process_delegation_result_dht,
+ rh);
}
unsigned int rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd)
{
- struct RecordLookupHandle* rlh;
- rlh = (struct RecordLookupHandle*) cls;
- int check_dht = GNUNET_YES;
- int s_len = 0;
+ struct RecordLookupHandle* rlh = cls;
+ int check_dht;
+ size_t s_len;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Resolution status: %d.\n",
- rh->id, rh->status);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: Resolution status: %d.\n",
+ rh->id, rh->status);
if (rh->status & RSL_PKEY_REVOKED)
{
return;
}
- if (strcmp(rh->name, "") == 0)
+ if (0 == strcmp(rh->name, ""))
{
/* We resolved full name for delegation. resolving record */
rh->id);
if (rh->status & RSL_CNAME_FOUND)
{
- if (rlh->record_type == GNUNET_GNS_RECORD_CNAME)
+ if (GNUNET_DNSPARSER_TYPE_CNAME == rlh->record_type)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_NS-%llu: Resolved queried CNAME in NS.\n",
}
/* A .+ CNAME */
- if (is_tld ((char*)rd->data, GNUNET_GNS_TLD_PLUS))
+ if (GNUNET_YES == is_tld ((char*)rd->data, GNUNET_GNS_TLD_PLUS))
{
s_len = strlen (rd->data) - 2;
memcpy (rh->name, rd->data, s_len);
resolve_delegation_ns (rh);
return;
}
- else if (is_tld ((char*)rd->data, GNUNET_GNS_TLD_ZKEY))
+ else if (GNUNET_YES == is_tld ((char*)rd->data, GNUNET_GNS_TLD_ZKEY))
{
gns_resolver_lookup_record (rh->authority,
rh->private_local_zone,
}
else if (rh->status & RSL_DELEGATE_VPN)
{
- if (rlh->record_type == GNUNET_GNS_RECORD_VPN)
+ if (GNUNET_NAMESTORE_TYPE_VPN == rlh->record_type)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_NS-%llu: Resolved queried VPNRR in NS.\n",
}
else if (rh->status & RSL_DELEGATE_NS)
{
- if (rlh->record_type == GNUNET_GNS_RECORD_NS)
+ if (GNUNET_DNSPARSER_TYPE_NS == rlh->record_type)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Resolved queried NSRR in NS.\n",
- rh->id);
- finish_lookup(rh, rlh, rd_count, rd);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: Resolved queried NSRR in NS.\n",
+ rh->id);
+ finish_lookup (rh, rlh, rd_count, rd);
return;
- }
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: NS delegation starting.\n",
- rh->id);
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: NS delegation starting.\n",
+ rh->id);
GNUNET_assert (NULL != rd);
rh->proc = &handle_record_ns;
resolve_record_dns (rh, rd_count, rd);
finish_lookup (rh, rlh, 0, NULL);
return;
}
- else if (rlh->record_type == GNUNET_GNS_RECORD_PKEY)
+ else if (GNUNET_NAMESTORE_TYPE_PKEY == rlh->record_type)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_NS-%llu: Resolved queried PKEY in NS.\n",
if (rh->status & RSL_DELEGATE_NS)
{
- if (rlh->record_type == GNUNET_GNS_RECORD_NS)
+ if (GNUNET_DNSPARSER_TYPE_NS == rlh->record_type)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_NS-%llu: Resolved queried NSRR in NS.\n",
* or we are authority
**/
+ check_dht = GNUNET_YES;
if ((rh->status & RSL_RECORD_EXISTS) &&
!(rh->status & RSL_RECORD_EXPIRED))
check_dht = GNUNET_NO;
&rh->private_local_zone))
check_dht = GNUNET_NO;
- if (rh->only_cached == GNUNET_YES)
+ if (GNUNET_YES == rh->only_cached)
check_dht = GNUNET_NO;
- if (check_dht == GNUNET_NO)
+ if (GNUNET_YES == check_dht)
{
- if (is_canonical(rh->name))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Resolving canonical record %s\n",
- rh->id,
- rh->name);
- rh->proc = &handle_record_ns;
- resolve_record_ns(rh);
- }
- else
- {
- /* give up, cannot resolve */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Cannot fully resolve delegation for %s!\n",
- rh->id,
- rh->name);
- finish_lookup(rh, rlh, rd_count, rd);
- //rlh->proc(rlh->proc_cls, 0, NULL);
- }
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: Trying to resolve delegation for %s via DHT\n",
+ rh->id, rh->name);
+ rh->proc = &handle_delegation_dht;
+ resolve_delegation_dht(rh);
+ return;
+ }
+
+ if (GNUNET_NO == is_canonical (rh->name))
+ {
+ /* give up, cannot resolve */
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: Cannot fully resolve delegation for %s!\n",
+ rh->id,
+ rh->name);
+ finish_lookup(rh, rlh, rd_count, rd);
return;
}
-
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Trying to resolve delegation for %s via DHT\n",
- rh->id, rh->name);
- rh->proc = &handle_delegation_dht;
- resolve_delegation_dht(rh);
+ "GNS_PHASE_DELEGATE_NS-%llu: Resolving canonical record %s\n",
+ rh->id,
+ rh->name);
+ rh->proc = &handle_record_ns;
+ resolve_record_ns(rh);
}
*/
static void
process_delegation_result_ns (void* cls,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *key,
- struct GNUNET_TIME_Absolute expiration,
- const char *name,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_RsaSignature *signature)
+ 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 ResolverHandle *rh;
+ struct ResolverHandle *rh = cls;
struct GNUNET_TIME_Relative remaining_time;
struct GNUNET_CRYPTO_ShortHashCode zone;
- char new_name[MAX_DNS_NAME_LENGTH];
+ char new_name[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
unsigned int i;
struct GNUNET_TIME_Absolute et;
+ struct AuthorityChain *auth;
- rh = (struct ResolverHandle *)cls;
rh->namestore_task = NULL;
+ GNUNET_CRYPTO_short_hash (key,
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey),
+ &zone);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Got %d records from authority lookup\n",
- rh->id, rd_count);
+ "GNS_PHASE_DELEGATE_NS-%llu: Got %d records from authority lookup for `%s' in zone %s\n",
+ rh->id, rd_count,
+ name,
+ GNUNET_short_h2s (&zone));
- GNUNET_CRYPTO_short_hash (key,
- sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &zone);
remaining_time = GNUNET_TIME_absolute_get_remaining (expiration);
rh->status = 0;
- if (name != NULL)
+ if (NULL != name)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Records with name %s exist.\n",
- rh->id, name);
+ "GNS_PHASE_DELEGATE_NS-%llu: Records with name `%s' exist in zone %s.\n",
+ rh->id, name,
+ GNUNET_short_h2s (&zone));
rh->status |= RSL_RECORD_EXISTS;
- if (remaining_time.rel_value == 0)
+ if (0 == remaining_time.rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_NS-%llu: Record set %s expired.\n",
/**
* No authority found in namestore.
*/
- if (rd_count == 0)
+ if (0 == rd_count)
{
/**
* We did not find an authority in the namestore
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_NS-%llu: Adding %s back to %s\n",
rh->id, rh->authority_name, rh->name);
- GNUNET_snprintf (new_name, MAX_DNS_NAME_LENGTH, "%s.%s",
+ GNUNET_snprintf (new_name, GNUNET_DNSPARSER_MAX_NAME_LENGTH, "%s.%s",
rh->name, rh->authority_name);
strcpy (rh->name, new_name);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
*/
for (i=0; i < rd_count;i++)
{
-
- /**
- * A CNAME. Like regular DNS this means the is no other record for this
- * name.
- */
- if (rd[i].record_type == GNUNET_GNS_RECORD_CNAME)
+ switch (rd[i].record_type)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: CNAME found.\n",
- rh->id);
+ case GNUNET_DNSPARSER_TYPE_CNAME:
+ /* Like in regular DNS this should mean that there is no other
+ * record for this name. */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: CNAME `%.*s' found.\n",
+ rh->id,
+ (int) rd[i].data_size,
+ rd[i].data);
rh->status |= RSL_CNAME_FOUND;
rh->proc (rh->proc_cls, rh, rd_count, rd);
return;
- }
-
- /**
- * Redirect via VPN
- */
- if (rd[i].record_type == GNUNET_GNS_RECORD_VPN)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: VPN found.\n",
- rh->id);
+ case GNUNET_NAMESTORE_TYPE_VPN:
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: VPN found.\n",
+ rh->id);
rh->status |= RSL_DELEGATE_VPN;
rh->proc (rh->proc_cls, rh, rd_count, rd);
return;
- }
-
- /**
- * Redirect via NS
- * FIXME make optional
- */
- if (rd[i].record_type == GNUNET_GNS_RECORD_NS)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: NS found.\n",
- rh->id);
+ case GNUNET_DNSPARSER_TYPE_NS:
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: NS `%.*s' found.\n",
+ rh->id,
+ (int) rd[i].data_size,
+ rd[i].data);
rh->status |= RSL_DELEGATE_NS;
rh->proc (rh->proc_cls, rh, rd_count, rd);
return;
- }
-
- if (rd[i].record_type != GNUNET_GNS_RECORD_PKEY)
- continue;
-
- rh->status |= RSL_DELEGATE_PKEY;
-
- if ((ignore_pending_records != 0) &&
- (rd[i].flags & GNUNET_NAMESTORE_RF_PENDING))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: PKEY for %s is pending user confirmation.\n",
- rh->id,
- name);
- continue;
- }
-
- GNUNET_break (0 == (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
- et.abs_value = rd[i].expiration_time;
- if ((GNUNET_TIME_absolute_get_remaining (et)).rel_value
- == 0)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: This pkey is expired.\n",
- rh->id);
- if (remaining_time.rel_value == 0)
+ case GNUNET_NAMESTORE_TYPE_PKEY:
+ rh->status |= RSL_DELEGATE_PKEY;
+ if ((ignore_pending_records != 0) &&
+ (rd[i].flags & GNUNET_NAMESTORE_RF_PENDING))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: This dht entry is expired.\n",
- rh->id);
- rh->authority_chain_head->fresh = 0;
- rh->proc (rh->proc_cls, rh, 0, NULL);
- return;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: PKEY for %s is pending user confirmation.\n",
+ rh->id,
+ name);
+ continue;
+ }
+ GNUNET_break (0 == (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
+ et.abs_value_us = rd[i].expiration_time;
+ if (0 == (GNUNET_TIME_absolute_get_remaining (et)).rel_value_us)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: This pkey is expired.\n",
+ rh->id);
+ if (remaining_time.rel_value_us == 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: This dht entry is expired.\n",
+ rh->id);
+ rh->authority_chain_head->fresh = 0;
+ rh->proc (rh->proc_cls, rh, 0, NULL);
+ return;
+ }
+ continue;
}
-
- continue;
+ /* Resolve rest of query with new authority */
+ memcpy (&rh->authority, rd[i].data,
+ sizeof (struct GNUNET_CRYPTO_ShortHashCode));
+ auth = GNUNET_malloc(sizeof (struct AuthorityChain));
+ auth->zone = rh->authority;
+ memset (auth->name, 0, strlen (rh->authority_name)+1);
+ strcpy (auth->name, rh->authority_name);
+ GNUNET_CONTAINER_DLL_insert (rh->authority_chain_head,
+ rh->authority_chain_tail,
+ auth);
+ if (NULL != rh->rd.data)
+ GNUNET_free ((void*)(rh->rd.data));
+ memcpy (&rh->rd, &rd[i], sizeof (struct GNUNET_NAMESTORE_RecordData));
+ rh->rd.data = GNUNET_malloc (rd[i].data_size);
+ memcpy ((void*)rh->rd.data, rd[i].data, rd[i].data_size);
+ rh->rd_count = 1;
+ /* Check for key revocation and delegate */
+ rh->namestore_task = GNUNET_NAMESTORE_lookup_record (namestore_handle,
+ &rh->authority,
+ GNUNET_GNS_MASTERZONE_STR,
+ GNUNET_NAMESTORE_TYPE_REV,
+ &process_pkey_revocation_result_ns,
+ rh);
+ return;
+ default:
+ /* ignore, move to next result */
+ break;
}
-
- /**
- * Resolve rest of query with new authority
- */
- GNUNET_assert (rd[i].record_type == GNUNET_GNS_RECORD_PKEY);
- memcpy (&rh->authority, rd[i].data,
- sizeof (struct GNUNET_CRYPTO_ShortHashCode));
- struct AuthorityChain *auth = GNUNET_malloc(sizeof (struct AuthorityChain));
- auth->zone = rh->authority;
- memset (auth->name, 0, strlen (rh->authority_name)+1);
- strcpy (auth->name, rh->authority_name);
- GNUNET_CONTAINER_DLL_insert (rh->authority_chain_head,
- rh->authority_chain_tail,
- auth);
- if (NULL != rh->rd.data)
- GNUNET_free ((void*)(rh->rd.data));
-
- memcpy (&rh->rd, &rd[i], sizeof (struct GNUNET_NAMESTORE_RecordData));
- rh->rd.data = GNUNET_malloc (rd[i].data_size);
- memcpy ((void*)rh->rd.data, rd[i].data, rd[i].data_size);
- rh->rd_count = 1;
- /* Check for key revocation and delegate */
- rh->namestore_task = GNUNET_NAMESTORE_lookup_record (namestore_handle,
- &rh->authority,
- "+",
- GNUNET_GNS_RECORD_REV,
- &process_pkey_revocation_result_ns,
- rh);
- return;
-
}
- /**
- * no answers found
- */
+ /* no answers that would cause delegation were found */
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Authority lookup and no PKEY...\n", rh->id);
+ "GNS_PHASE_DELEGATE_NS-%llu: Authority lookup failed (no PKEY record)\n",
+ rh->id);
/**
* If we have found some records for the LAST label
- * we return the results. Else null.
+ * we return the results. Else NULL.
*/
- if (strcmp(rh->name, "") == 0)
+ if (0 == strcmp (rh->name, ""))
{
/* Start shortening */
- if ((rh->priv_key != NULL) && is_canonical (rh->name))
+ if ((rh->priv_key != NULL) &&
+ (is_canonical (rh->name) == GNUNET_YES))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_NS-%llu: Trying to shorten authority chain\n",
rh->id);
- start_shorten (rh->authority_chain_tail,
+ start_shorten (rh->authority_chain_head,
rh->priv_key);
}
/* simply promote back */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Promoting %s back to name\n",
- rh->id, rh->authority_name);
- strcpy(rh->name, rh->authority_name);
- rh->proc(rh->proc_cls, rh, rd_count, rd);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: Promoting %s back to name\n",
+ rh->id, rh->authority_name);
+ strcpy (rh->name, rh->authority_name);
+ rh->proc (rh->proc_cls, rh, rd_count, rd);
}
else
{
- rh->proc(rh->proc_cls, rh, 0, NULL);
+ GNUNET_snprintf (new_name, GNUNET_DNSPARSER_MAX_NAME_LENGTH,
+ "%s.%s", rh->name, rh->authority_name);
+ strcpy (rh->name, new_name);
+ rh->proc (rh->proc_cls, rh, 0, NULL);
}
}
/**
* Resolve the delegation chain for the request in our namestore
+ * (as in, find the respective authority for the leftmost label).
*
* @param rh the resolver handle
*/
static void
resolve_delegation_ns (struct ResolverHandle *rh)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Resolving delegation for %s\n",
- rh->id, rh->name);
- pop_tld(rh->name, rh->authority_name);
- rh->namestore_task = GNUNET_NAMESTORE_lookup_record(namestore_handle,
- &rh->authority,
- rh->authority_name,
- GNUNET_GNS_RECORD_ANY,
- &process_delegation_result_ns,
- rh);
-
+ pop_tld (rh->name, rh->authority_name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: Finding authority for `%s' by looking up `%s' in GADS zone `%s'\n",
+ rh->id,
+ rh->name,
+ rh->authority_name,
+ GNUNET_short_h2s (&rh->authority));
+ rh->namestore_task = GNUNET_NAMESTORE_lookup_record (namestore_handle,
+ &rh->authority,
+ rh->authority_name,
+ GNUNET_DNSPARSER_TYPE_ANY,
+ &process_delegation_result_ns,
+ rh);
}
+#endif
+
+
/**
- * Lookup of a record in a specific zone
- * calls lookup result processor on result
+ * Lookup of a record in a specific zone calls lookup result processor
+ * on result.
*
- * @param zone the root zone
- * @param pzone the private local zone
+ * @param zone the zone to perform the lookup in
* @param record_type the record type to look up
* @param name the name to look up
- * @param key a private key for use with PSEU import (can be NULL)
- * @param timeout timeout for resolution
+ * @param shorten_key a private key for use with PSEU import (can be NULL)
* @param only_cached GNUNET_NO to only check locally not DHT for performance
* @param proc the processor to call on result
- * @param cls the closure to pass to proc
- */
-void
-gns_resolver_lookup_record (struct GNUNET_CRYPTO_ShortHashCode zone,
- struct GNUNET_CRYPTO_ShortHashCode pzone,
- uint32_t record_type,
- const char* name,
- struct GNUNET_CRYPTO_RsaPrivateKey *key,
- struct GNUNET_TIME_Relative timeout,
- int only_cached,
- RecordLookupProcessor proc,
- void* cls)
+ * @param proc_cls the closure to pass to @a proc
+ * @return handle to cancel operation
+ */
+struct GNS_ResolverHandle *
+GNS_resolver_lookup (const struct GNUNET_CRYPTO_EccPublicKey *zone,
+ uint32_t record_type,
+ const char *name,
+ const struct GNUNET_CRYPTO_EccPrivateKey *shorten_key,
+ int only_cached,
+ GNS_ResultProcessor proc, void *proc_cls)
{
+ return NULL;
+#if 0
struct ResolverHandle *rh;
struct RecordLookupHandle* rlh;
- char string_hash[MAX_DNS_LABEL_LENGTH];
- char nzkey[MAX_DNS_LABEL_LENGTH];
+ char string_hash[GNUNET_DNSPARSER_MAX_LABEL_LENGTH];
+ char nzkey[GNUNET_DNSPARSER_MAX_LABEL_LENGTH];
char* nzkey_ptr = nzkey;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting resolution for %s (type=%d)!\n",
- name, record_type);
+ "Starting resolution for `%s' (type=%d) with timeout %s!\n",
+ name, record_type,
+ GNUNET_STRINGS_relative_time_to_string (timeout, GNUNET_YES));
-
- if (is_canonical((char*)name) && (strcmp(GNUNET_GNS_TLD, name) != 0))
+ if ((is_canonical ((char*)name) == GNUNET_YES) &&
+ (strcmp(GNUNET_GNS_TLD, name) != 0))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%s is canonical and not gnunet -> cannot resolve!\n", name);
rlh = GNUNET_malloc (sizeof(struct RecordLookupHandle));
rh = GNUNET_malloc (sizeof (struct ResolverHandle));
-
- memset (rh, 0, sizeof (struct ResolverHandle));
rh->authority = zone;
- rh->id = rid++;
+ rh->id = rid_gen++;
rh->proc_cls = rlh;
rh->priv_key = key;
rh->timeout = timeout;
- rh->get_handle = NULL;
rh->private_local_zone = pzone;
rh->only_cached = only_cached;
- rh->namestore_task = NULL;
- rh->rd.data = NULL;
GNUNET_CONTAINER_DLL_insert (rlh_head, rlh_tail, rh);
if (NULL == key)
- {
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"No shorten key for resolution\n");
- }
- if (timeout.rel_value != GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
+ if (timeout.rel_value_us != GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us)
{
/*
* Set timeout for authority lookup phase to 1/2
*/
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Timeout for lookup set to %ds\n", rh->timeout.rel_value);
- rh->timeout_task = GNUNET_SCHEDULER_add_delayed(
+ "Timeout for lookup set to %s/2\n",
+ GNUNET_STRINGS_relative_time_to_string (rh->timeout, GNUNET_YES));
+ rh->timeout_task = GNUNET_SCHEDULER_add_delayed (
GNUNET_TIME_relative_divide(timeout, 2),
&handle_lookup_timeout,
rh);
if (strcmp(GNUNET_GNS_TLD, name) == 0)
{
/**
- * Only 'gnunet' given
+ * Only '.gads' given
*/
- strcpy(rh->name, "\0");
+ strcpy (rh->name, "\0");
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Checking for TLD...\n");
if (is_zkey_tld(name) == GNUNET_YES)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
strlen(name)-strlen(GNUNET_GNS_TLD_ZKEY));
memcpy(rh->name, name,
strlen(name)-strlen(GNUNET_GNS_TLD_ZKEY) - 1);
- pop_tld(rh->name, string_hash);
+ pop_tld (rh->name, string_hash);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"ZKEY is %s!\n", string_hash);
&rh->authority))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Cannot convert ZKEY %s to hash!\n", string_hash);
+ "Cannot convert ZKEY `%s' to hash!\n", string_hash);
+ if (GNUNET_SCHEDULER_NO_TASK != rh->timeout_task)
+ GNUNET_SCHEDULER_cancel (rh->timeout_task);
GNUNET_CONTAINER_DLL_remove (rlh_head, rlh_tail, rh);
GNUNET_free (rh);
GNUNET_free (rlh);
}
}
- else if (is_gnunet_tld (name) == GNUNET_YES)
+ else if (is_gads_tld (name) == GNUNET_YES)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "TLD is gnunet\n");
+ "TLD is gads\n");
/**
- * Presumably GNUNET tld
+ * Presumably GADS tld
*/
- memset (rh->name, 0,
- strlen(name)-strlen(GNUNET_GNS_TLD));
memcpy (rh->name, name,
- strlen(name)-strlen(GNUNET_GNS_TLD) - 1);
+ strlen (name) - strlen(GNUNET_GNS_TLD) - 1);
+ rh->name[strlen (name) - strlen(GNUNET_GNS_TLD) - 1] = '\0';
}
else
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Cannot handle this TLD %s\n", string_hash);
-
+ _("Not a GADS TLD: `%s'\n"),
+ name);
if (GNUNET_SCHEDULER_NO_TASK != rh->timeout_task)
GNUNET_SCHEDULER_cancel (rh->timeout_task);
GNUNET_CONTAINER_DLL_remove (rlh_head, rlh_tail, rh);
/**
* Initialize authority chain
*/
- rh->authority_chain_head = GNUNET_malloc(sizeof(struct AuthorityChain));
- rh->authority_chain_head->prev = NULL;
- rh->authority_chain_head->next = NULL;
+ rh->authority_chain_head = GNUNET_malloc (sizeof(struct AuthorityChain));
rh->authority_chain_tail = rh->authority_chain_head;
rh->authority_chain_head->zone = rh->authority;
strcpy (rh->authority_chain_head->name, "");
rlh->proc_cls = cls;
rh->proc = &handle_delegation_ns;
- resolve_delegation_ns(rh);
+ resolve_delegation_ns (rh);
+#endif
}
-/******** END Record Resolver ***********/
-
-static void
-finish_shorten (struct ResolverHandle *rh,
- struct NameShortenHandle *nsh)
-{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending %s as shorten result\n", nsh->result);
- nsh->proc (nsh->proc_cls, nsh->result);
- GNUNET_CONTAINER_DLL_remove (nsh_head, nsh_tail, rh);
- GNUNET_free (nsh);
- free_resolver_handle (rh);
-}
/**
- * Callback calles by namestore for a zone to name
- * result
+ * Cancel active resolution (i.e. client disconnected).
*
- * @param cls the closure
- * @param zone_key the zone we queried
- * @param expire the expiration time of the name
- * @param name the name found or NULL
- * @param rd_len number of records for the name
- * @param rd the record data (PKEY) for the name
- * @param signature the signature for the record data
+ * @param h resolution to abort
*/
-static void
-process_zone_to_name_shorten_root (void *cls,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
- struct GNUNET_TIME_Absolute expire,
- const char *name,
- unsigned int rd_len,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_RsaSignature *signature);
+void
+GNS_resolver_lookup_cancel (struct GNS_ResolverHandle *h)
+{
+}
+
+
+/* ***************** Resolver initialization ********************* */
/**
- * Callback called by namestore for a zone to name
- * result
+ * Initialize the resolver
*
- * @param cls the closure
- * @param zone_key the zone we queried
- * @param expire the expiration time of the name
- * @param name the name found or NULL
- * @param rd_len number of records for the name
- * @param rd the record data (PKEY) for the name
- * @param signature the signature for the record data
- */
-static void
-process_zone_to_name_shorten_shorten (void *cls,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
- struct GNUNET_TIME_Absolute expire,
- const char *name,
- unsigned int rd_len,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_RsaSignature *signature)
-{
- struct ResolverHandle *rh = (struct ResolverHandle *)cls;
- struct NameShortenHandle* nsh = (struct NameShortenHandle*)rh->proc_cls;
- struct AuthorityChain *next_authority;
-
- char result[MAX_DNS_NAME_LENGTH];
- char tmp_name[MAX_DNS_NAME_LENGTH];
- size_t answer_len;
-
- rh->namestore_task = NULL;
- /* we found a match in our own root zone */
- if (rd_len != 0)
- {
- answer_len = strlen(rh->name) + strlen(name) + strlen(GNUNET_GNS_TLD) + 3;
- memset(result, 0, answer_len);
-
- if (strlen(rh->name) > 0)
- {
- sprintf (result, "%s.%s.%s.%s",
- rh->name, name,
- nsh->shorten_zone_name,
- GNUNET_GNS_TLD);
- }
- else
- {
- sprintf (result, "%s.%s.%s", name,
- nsh->shorten_zone_name,
- GNUNET_GNS_TLD);
- }
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Found shorten result %s\n", result);
- if (strlen (nsh->result) > strlen (result))
- strcpy (nsh->result, result);
- }
- else if (GNUNET_CRYPTO_short_hash_cmp(&rh->authority_chain_head->zone,
- nsh->shorten_zone) == 0)
- {
- /**
- * This is our zone append .gnunet unless name is empty
- * (it shouldn't be, usually FIXME what happens if we
- * shorten to our zone to a "" record??)
- */
-
- sprintf (result, "%s.%s.%s",
- rh->name,
- nsh->shorten_zone_name,
- GNUNET_GNS_TLD);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Our zone: Found %s as shorten result\n", result);
-
- if (strlen (nsh->result) > strlen (result))
- strcpy (nsh->result, result);
- //nsh->proc(nsh->proc_cls, result);
- //GNUNET_free(nsh);
- //free_resolver_handle(rh);
- //return;
- }
-
-
- /**
- * No PSEU found.
- * continue with next authority if exists
- */
- if ((rh->authority_chain_head->next == NULL))
- {
- finish_shorten (rh, nsh);
- return;
- }
- next_authority = rh->authority_chain_head;
-
- GNUNET_snprintf(tmp_name, MAX_DNS_NAME_LENGTH,
- "%s.%s", rh->name, next_authority->name);
-
- strcpy(rh->name, tmp_name);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "No PSEU found for authority %s. Promoting back: %s\n",
- next_authority->name, rh->name);
-
- GNUNET_CONTAINER_DLL_remove(rh->authority_chain_head,
- rh->authority_chain_tail,
- next_authority);
-
- GNUNET_free (next_authority);
-
- rh->namestore_task = GNUNET_NAMESTORE_zone_to_name (namestore_handle,
- &rh->authority_chain_tail->zone,
- &rh->authority_chain_head->zone,
- &process_zone_to_name_shorten_root,
- rh);
-}
-
-/**
- * Callback calles by namestore for a zone to name
- * result
- *
- * @param cls the closure
- * @param zone_key the zone we queried
- * @param expire the expiration time of the name
- * @param name the name found or NULL
- * @param rd_len number of records for the name
- * @param rd the record data (PKEY) for the name
- * @param signature the signature for the record data
- */
-static void
-process_zone_to_name_shorten_private (void *cls,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
- struct GNUNET_TIME_Absolute expire,
- const char *name,
- unsigned int rd_len,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_RsaSignature *signature)
-{
- struct ResolverHandle *rh = (struct ResolverHandle *)cls;
- struct NameShortenHandle* nsh = (struct NameShortenHandle*)rh->proc_cls;
- struct AuthorityChain *next_authority;
-
- char result[MAX_DNS_NAME_LENGTH];
- char tmp_name[MAX_DNS_NAME_LENGTH];
- size_t answer_len;
-
- rh->namestore_task = NULL;
- /* we found a match in our own root zone */
- if (rd_len != 0)
- {
- answer_len = strlen(rh->name) + strlen(name) + strlen(GNUNET_GNS_TLD) + 3;
- memset(result, 0, answer_len);
-
- if (strlen(rh->name) > 0)
- {
- sprintf (result, "%s.%s.%s", rh->name, name, GNUNET_GNS_TLD);
- }
- else
- {
- sprintf (result, "%s.%s", name, GNUNET_GNS_TLD);
- }
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Found shorten result %s\n", result);
- if (strlen (nsh->result) > strlen (result))
- strcpy (nsh->result, result);
- }
- else if (GNUNET_CRYPTO_short_hash_cmp(&rh->authority_chain_head->zone,
- nsh->private_zone) == 0)
- {
- /**
- * This is our zone append .gnunet unless name is empty
- * (it shouldn't be, usually FIXME what happens if we
- * shorten to our zone to a "" record??)
- */
-
- sprintf (result, "%s.%s.%s",
- rh->name, nsh->private_zone_name, GNUNET_GNS_TLD);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Our private zone: Found %s as shorten result %s\n", result);
- if (strlen (nsh->result) > strlen (result))
- strcpy (nsh->result, result);
- }
-
- if (0 != strcmp (nsh->shorten_zone_name, ""))
- {
- /* backtrack authorities for names in priv zone */
- rh->namestore_task = GNUNET_NAMESTORE_zone_to_name (namestore_handle,
- nsh->shorten_zone,
- &rh->authority_chain_head->zone,
- &process_zone_to_name_shorten_shorten,
- rh);
- }
- else
- {
- /**
- * No PSEU found.
- * continue with next authority if exists
- */
- if ((rh->authority_chain_head->next == NULL))
- {
- finish_shorten (rh, nsh);
- return;
- }
- next_authority = rh->authority_chain_head;
-
- GNUNET_snprintf(tmp_name, MAX_DNS_NAME_LENGTH,
- "%s.%s", rh->name, next_authority->name);
-
- strcpy(rh->name, tmp_name);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "No PSEU found for authority %s. Promoting back: %s\n",
- next_authority->name, rh->name);
-
- GNUNET_CONTAINER_DLL_remove(rh->authority_chain_head,
- rh->authority_chain_tail,
- next_authority);
-
- GNUNET_free (next_authority);
-
- rh->namestore_task = GNUNET_NAMESTORE_zone_to_name (namestore_handle,
- &rh->authority_chain_tail->zone,
- &rh->authority_chain_head->zone,
- &process_zone_to_name_shorten_root,
- rh);
- }
-}
-
-/**
- * Callback calles by namestore for a zone to name
- * result
- *
- * @param cls the closure
- * @param zone_key the zone we queried
- * @param expire the expiration time of the name
- * @param name the name found or NULL
- * @param rd_len number of records for the name
- * @param rd the record data (PKEY) for the name
- * @param signature the signature for the record data
- */
-static void
-process_zone_to_name_shorten_root (void *cls,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
- struct GNUNET_TIME_Absolute expire,
- const char *name,
- unsigned int rd_len,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_RsaSignature *signature)
-{
- struct ResolverHandle *rh = (struct ResolverHandle *)cls;
- struct NameShortenHandle* nsh = (struct NameShortenHandle*)rh->proc_cls;
- struct AuthorityChain *next_authority;
-
- char result[MAX_DNS_NAME_LENGTH];
- char tmp_name[MAX_DNS_NAME_LENGTH];
- size_t answer_len;
-
- rh->namestore_task = NULL;
- /* we found a match in our own root zone */
- if (rd_len != 0)
- {
- answer_len = strlen(rh->name) + strlen(name) + strlen(GNUNET_GNS_TLD) + 3;
- memset(result, 0, answer_len);
-
- if (strlen(rh->name) > 0)
- {
- sprintf (result, "%s.%s.%s", rh->name, name, GNUNET_GNS_TLD);
- }
- else
- {
- sprintf (result, "%s.%s", name, GNUNET_GNS_TLD);
- }
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Found shorten result %s\n", result);
- if (strlen (nsh->result) > strlen (result))
- strcpy (nsh->result, result);
- }
- else if (GNUNET_CRYPTO_short_hash_cmp(&rh->authority_chain_head->zone,
- nsh->root_zone) == 0)
- {
- /**
- * This is our zone append .gnunet unless name is empty
- * (it shouldn't be, usually FIXME what happens if we
- * shorten to our zone to a "" record??)
- */
-
- sprintf (result, "%s.%s", rh->name, GNUNET_GNS_TLD);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Our zone: Found %s as shorten result\n", result);
- if (strlen (nsh->result) > strlen (result))
- strcpy (nsh->result, result);
- }
-
- if (NULL != nsh->private_zone)
- {
- /* backtrack authorities for names in priv zone */
- rh->namestore_task = GNUNET_NAMESTORE_zone_to_name (namestore_handle,
- nsh->private_zone,
- &rh->authority_chain_head->zone,
- &process_zone_to_name_shorten_private,
- rh);
- }
- else if (NULL != nsh->shorten_zone)
- {
- /* backtrack authorities for names in shorten zone */
- rh->namestore_task = GNUNET_NAMESTORE_zone_to_name (namestore_handle,
- nsh->shorten_zone,
- &rh->authority_chain_head->zone,
- &process_zone_to_name_shorten_shorten,
- rh);
- }
- else
- {
- /**
- * No PSEU found.
- * continue with next authority if exists
- */
- if ((rh->authority_chain_head->next == NULL))
- {
- finish_shorten (rh, nsh);
- return;
- }
- next_authority = rh->authority_chain_head;
-
- GNUNET_snprintf(tmp_name, MAX_DNS_NAME_LENGTH,
- "%s.%s", rh->name, next_authority->name);
-
- strcpy(rh->name, tmp_name);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "No PSEU found for authority %s. Promoting back: %s\n",
- next_authority->name, rh->name);
-
- GNUNET_CONTAINER_DLL_remove(rh->authority_chain_head,
- rh->authority_chain_tail,
- next_authority);
-
- GNUNET_free (next_authority);
-
- rh->namestore_task = GNUNET_NAMESTORE_zone_to_name (namestore_handle,
- &rh->authority_chain_tail->zone,
- &rh->authority_chain_head->zone,
- &process_zone_to_name_shorten_root,
- rh);
- }
-}
-
-
-/**
- * Process result from namestore delegation lookup
- * for shorten operation
- *
- * @param cls the client shorten handle
- * @param rh the resolver handle
- * @param rd_count number of results (0)
- * @param rd data (NULL)
+ * @param nh the namestore handle
+ * @param dh the dht handle
+ * @param c configuration handle
+ * @param max_bg_queries maximum number of parallel background queries in dht
+ * @param ignore_pending ignore records that still require user confirmation
+ * on lookup
*/
void
-handle_delegation_ns_shorten (void* cls,
- struct ResolverHandle *rh,
- uint32_t rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
-{
- struct NameShortenHandle *nsh;
- char result[MAX_DNS_NAME_LENGTH];
-
- nsh = (struct NameShortenHandle *)cls;
-
- /**
- * At this point rh->name contains the part of the name
- * that we do not have a PKEY in our namestore to resolve.
- * The authority chain in the resolver handle is now
- * useful to backtrack if needed
- */
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "PKEY resolved as far as possible in ns up to %s!\n", rh->name);
- memset(result, 0, sizeof (result));
-
- if (GNUNET_CRYPTO_short_hash_cmp(&rh->authority_chain_head->zone,
- nsh->root_zone) == 0)
- {
- /**
- * This is our zone append .gnunet unless name is empty
- * (it shouldn't be, usually FIXME what happens if we
- * shorten to our zone to a "" record??)
- */
-
- sprintf (result, "%s.%s", rh->name, GNUNET_GNS_TLD);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Our zone: Found %s as shorten result\n", result);
-
- if (strlen (nsh->result) > strlen (result))
- strcpy (nsh->result, result);
-
- }
- else if (NULL != nsh->private_zone)
- {
- /**
- * This is our zone append .gnunet unless name is empty
- * (it shouldn't be, usually FIXME what happens if we
- * shorten to our zone to a "" record??)
- */
- if (GNUNET_CRYPTO_short_hash_cmp(&rh->authority_chain_head->zone,
- nsh->private_zone) == 0)
- {
-
- sprintf (result, "%s.%s.%s",
- rh->name, nsh->private_zone_name, GNUNET_GNS_TLD);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Our zone: Found %s as shorten result in private zone %s\n",
- result);
-
- if (strlen (nsh->result) > strlen (result))
- strcpy (nsh->result, result);
- }
- }
- else if (NULL != nsh->shorten_zone)
- {
- /**
- * This is our zone append .gnunet unless name is empty
- * (it shouldn't be, usually FIXME what happens if we
- * shorten to our zone to a "" record??)
- */
- if (GNUNET_CRYPTO_short_hash_cmp(&rh->authority_chain_head->zone,
- nsh->shorten_zone) == 0)
- {
- sprintf (result, "%s.%s.%s",
- rh->name, nsh->private_zone_name, GNUNET_GNS_TLD);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Our zone: Found %s as shorten result in shorten zone\n",
- result);
-
- if (strlen (nsh->result) > strlen (result))
- strcpy (nsh->result, result);
- }
- }
-
-
- /* backtrack authorities for names */
- rh->namestore_task = GNUNET_NAMESTORE_zone_to_name (namestore_handle,
- nsh->root_zone,
- &rh->authority_chain_head->zone,
- &process_zone_to_name_shorten_root,
- rh);
-
-}
-
-
-/**
- * Callback calles by namestore for a zone to name
- * result
- *
- * @param cls the closure
- * @param zone_key the zone we queried
- * @param expire the expiration time of the name
- * @param name the name found or NULL
- * @param rd_len number of records for the name
- * @param rd the record data (PKEY) for the name
- * @param signature the signature for the record data
- */
-static void
-process_zone_to_name_zkey(void *cls,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
- struct GNUNET_TIME_Absolute expire,
- const char *name,
- unsigned int rd_len,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_RsaSignature *signature)
+GNS_resolver_init (struct GNUNET_NAMESTORE_Handle *nh,
+ struct GNUNET_DHT_Handle *dh,
+ const struct GNUNET_CONFIGURATION_Handle *c,
+ unsigned long long max_bg_queries)
{
- struct ResolverHandle *rh = cls;
- struct NameShortenHandle *nsh = rh->proc_cls;
- struct GNUNET_CRYPTO_ShortHashAsciiEncoded enc;
- char new_name[MAX_DNS_NAME_LENGTH];
+ char *dns_ip;
- /* zkey not in our zone */
- if (name == NULL)
+ cfg = c;
+ namestore_handle = nh;
+ dht_handle = dh;
+ dht_lookup_heap =
+ GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
+ max_allowed_background_queries = max_bg_queries;
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_string (c,
+ "gns",
+ "DNS_RESOLVER",
+ &dns_ip))
{
- /**
- * In this case we have not given this PKEY a name (yet)
- * It is either just not in our zone or not even cached
- * Since we do not know at this point we will not try to shorten
- * because PKEY import will happen if the user follows the zkey
- * link.
- */
- GNUNET_CRYPTO_short_hash_to_enc ((struct GNUNET_CRYPTO_ShortHashCode*)rd,
- &enc);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "No name found for zkey %s returning verbatim!\n", enc);
- if (strcmp(rh->name, "") != 0)
- GNUNET_snprintf(new_name, MAX_DNS_NAME_LENGTH, "%s.%s.%s",
- rh->name, enc, GNUNET_GNS_TLD_ZKEY);
- else
- GNUNET_snprintf(new_name, MAX_DNS_NAME_LENGTH, "%s.%s",
- enc, GNUNET_GNS_TLD_ZKEY);
-
- strcpy (nsh->result, new_name);
-
- finish_shorten (rh, nsh);
- return;
+ /* user did not specify DNS resolver, use 8.8.8.8 */
+ dns_ip = GNUNET_strdup ("8.8.8.8");
}
-
- if (strcmp(rh->name, "") != 0)
- GNUNET_snprintf(new_name, MAX_DNS_NAME_LENGTH, "%s.%s",
- rh->name, name);
- else
- strcpy(new_name, name);
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Continue shorten for %s!\n", new_name);
-
- strcpy(rh->name, new_name);
-
- rh->authority_chain_head = GNUNET_malloc(sizeof(struct AuthorityChain));
- rh->authority_chain_tail = rh->authority_chain_head;
- rh->authority_chain_head->zone = rh->authority;
-
-
- /* Start delegation resolution in our namestore */
- resolve_delegation_ns (rh);
+ dns_handle = GNUNET_DNSSTUB_start (dns_ip);
+ GNUNET_free (dns_ip);
}
/**
- * Shorten api from resolver
- *
- * @param zone the root zone to use
- * @param pzone the private zone to use
- * @param szone the shorten zone to use
- * @param name the name to shorten
- * @param private_zone_name name of the private zone
- * @param shorten_zone_name name of the shorten zone
- * @param proc the processor to call with result
- * @param proc_cls closure to pass to proc
+ * Shutdown resolver
*/
void
-gns_resolver_shorten_name (struct GNUNET_CRYPTO_ShortHashCode *zone,
- struct GNUNET_CRYPTO_ShortHashCode *pzone,
- struct GNUNET_CRYPTO_ShortHashCode *szone,
- const char* name,
- const char* private_zone_name,
- const char* shorten_zone_name,
- ShortenResultProcessor proc,
- void* proc_cls)
+GNS_resolver_done ()
{
- struct ResolverHandle *rh;
- struct NameShortenHandle *nsh;
- char string_hash[MAX_DNS_LABEL_LENGTH];
- struct GNUNET_CRYPTO_ShortHashCode zkey;
- char nzkey[MAX_DNS_LABEL_LENGTH];
- char* nzkey_ptr = nzkey;
-
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting shorten for %s!\n", name);
-
- if (is_canonical ((char*)name))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "%s is canonical. Returning verbatim\n", name);
- proc (proc_cls, name);
- return;
- }
-
- nsh = GNUNET_malloc (sizeof (struct NameShortenHandle));
-
- nsh->proc = proc;
- nsh->proc_cls = proc_cls;
- nsh->root_zone = zone;
- nsh->private_zone = pzone;
- nsh->shorten_zone = szone;
- strcpy (nsh->private_zone_name, private_zone_name);
- strcpy (nsh->shorten_zone_name, shorten_zone_name);
- strcpy (nsh->result, name);
-
-
- rh = GNUNET_malloc (sizeof (struct ResolverHandle));
- rh->authority = *zone;
- rh->id = rid++;
- rh->priv_key = NULL;
- rh->namestore_task = NULL;
- rh->proc = &handle_delegation_ns_shorten;
- rh->proc_cls = nsh;
- rh->id = rid++;
- rh->private_local_zone = *zone;
-
- GNUNET_CONTAINER_DLL_insert (nsh_head, nsh_tail, rh);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Checking for TLD...\n");
- if (is_zkey_tld (name) == GNUNET_YES)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "TLD is zkey\n");
- /**
- * This is a zkey tld
- * build hash and use as initial authority
- * FIXME sscanf
- */
- memset (rh->name, 0,
- strlen (name)-strlen (GNUNET_GNS_TLD_ZKEY));
- memcpy (rh->name, name,
- strlen(name)-strlen (GNUNET_GNS_TLD_ZKEY) - 1);
- pop_tld (rh->name, string_hash);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "ZKEY is %s!\n", string_hash);
-
- GNUNET_STRINGS_utf8_toupper (string_hash, &nzkey_ptr);
-
- if (GNUNET_OK != GNUNET_CRYPTO_short_hash_from_string (nzkey,
- &zkey))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Cannot convert ZKEY %s to hash!\n", nzkey);
- GNUNET_free (rh);
- GNUNET_free (nsh);
- GNUNET_CONTAINER_DLL_remove (nsh_head, nsh_tail, rh);
- proc (proc_cls, name);
- return;
- }
-
- rh->namestore_task = GNUNET_NAMESTORE_zone_to_name (namestore_handle,
- zone, //ours
- &zkey,
- &process_zone_to_name_zkey,
- rh);
- return;
-
- }
- else if (is_gnunet_tld (name) == GNUNET_YES)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "TLD is gnunet\n");
- /**
- * Presumably GNUNET tld
- */
- memset (rh->name, 0,
- strlen (name)-strlen (GNUNET_GNS_TLD));
- memcpy (rh->name, name,
- strlen (name)-strlen (GNUNET_GNS_TLD) - 1);
- }
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unknown TLD in %s\n", name);
- GNUNET_free (rh);
- GNUNET_free (nsh);
- GNUNET_CONTAINER_DLL_remove (nsh_head, nsh_tail, rh);
- proc (proc_cls, name);
- return;
- }
-
- rh->authority_chain_head = GNUNET_malloc (sizeof (struct AuthorityChain));
- rh->authority_chain_tail = rh->authority_chain_head;
- rh->authority_chain_head->zone = *zone;
-
-
- /* Start delegation resolution in our namestore */
- resolve_delegation_ns (rh);
+ while (NULL != gph_head)
+ free_get_pseu_authority_handle (gph_head);
+ GNUNET_CONTAINER_heap_destroy (dht_lookup_heap);
+ dht_lookup_heap = NULL;
+ GNUNET_DNSSTUB_stop (dns_handle);
+ dns_handle = NULL;
}
-/*********** END NAME SHORTEN ********************/
-/**
- * Conclude get authority lookup
- *
- * @param rh resolver handle
- * @param nah get authority lookup handle
- */
-static void
-finish_get_auth (struct ResolverHandle *rh,
- struct GetNameAuthorityHandle *nah)
-{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Got authority result %s\n", nah->result);
-
- nah->proc(nah->proc_cls, nah->result);
- GNUNET_CONTAINER_DLL_remove (nah_head, nah_tail, rh);
- GNUNET_free(nah);
- free_resolver_handle(rh);
-}
+/* *************** common helper functions (do not really belong here) *********** */
/**
- * Process result from namestore delegation lookup
- * for get authority operation
+ * Checks if "name" ends in ".tld"
*
- * @param cls the client get auth handle
- * @param rh the resolver handle
- * @param rd_count number of results (0)
- * @param rd data (NULL)
+ * @param name the name to check
+ * @param tld the TLD to check for
+ * @return GNUNET_YES or GNUNET_NO
*/
-void
-handle_delegation_result_ns_get_auth(void* cls,
- struct ResolverHandle *rh,
- uint32_t rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+int
+is_tld (const char* name, const char* tld)
{
- struct GetNameAuthorityHandle* nah;
- size_t answer_len;
-
- nah = (struct GetNameAuthorityHandle*) rh->proc_cls;
-
- /**
- * At this point rh->name contains the part of the name
- * that we do not have a PKEY in our namestore to resolve.
- * The authority chain in the resolver handle is now
- * useful to backtrack if needed
- */
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "PKEY resolved as far as possible in ns up to %s!\n", rh->name);
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Building response!\n");
- if (is_canonical(rh->name))
- {
- /**
- * We successfully resolved the authority in the ns
- * FIXME for our purposes this is fine
- * but maybe we want to have an api that also looks
- * into the dht (i.e. option in message)
- **/
- if (strlen(rh->name) > strlen(nah->name))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Record name longer than original lookup name... odd!\n");
- //FIXME to sth here
- }
-
- answer_len = strlen(nah->name) - strlen(rh->name)
- + strlen(GNUNET_GNS_TLD) + 1;
- memset(nah->result, 0, answer_len);
- strcpy(nah->result, nah->name + strlen(rh->name) + 1);
-
- finish_get_auth (rh, nah);
- }
- else
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Unable to resolve authority for remaining %s!\n", rh->name);
- strcpy(nah->result, "");
- finish_get_auth (rh, nah);
- }
-
+ size_t offset = 0;
+ if (strlen (name) <= strlen (tld))
+ return GNUNET_NO;
+ offset = strlen (name) - strlen (tld);
+ if (0 != strcmp (name + offset, tld))
+ return GNUNET_NO;
+ return GNUNET_YES;
}
-/**
- * Tries to resolve the authority for name
- * in our namestore
- *
- * @param zone the root zone to look up for
- * @param pzone the private local zone
- * @param name the name to lookup up
- * @param proc the processor to call when finished
- * @param proc_cls the closure to pass to the processor
- */
-void
-gns_resolver_get_authority(struct GNUNET_CRYPTO_ShortHashCode zone,
- struct GNUNET_CRYPTO_ShortHashCode pzone,
- const char* name,
- GetAuthorityResultProcessor proc,
- void* proc_cls)
-{
- struct ResolverHandle *rh;
- struct GetNameAuthorityHandle *nah;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting authority resolution for %s!\n", name);
-
- nah = GNUNET_malloc(sizeof (struct GetNameAuthorityHandle));
- rh = GNUNET_malloc(sizeof (struct ResolverHandle));
- rh->authority = zone;
- rh->id = rid++;
- rh->private_local_zone = pzone;
- rh->namestore_task = NULL;
-
- GNUNET_CONTAINER_DLL_insert (nah_head, nah_tail, rh);
-
- if (strcmp(GNUNET_GNS_TLD, name) == 0)
- {
- strcpy(rh->name, "\0");
- }
- else
- {
- memset(rh->name, 0,
- strlen(name)-strlen(GNUNET_GNS_TLD));
- memcpy(rh->name, name,
- strlen(name)-strlen(GNUNET_GNS_TLD) - 1);
- }
-
- memset(nah->name, 0,
- strlen(name)+1);
- strcpy(nah->name, name);
-
- rh->authority_chain_head = GNUNET_malloc(sizeof(struct AuthorityChain));
- rh->authority_chain_tail = rh->authority_chain_head;
- rh->authority_chain_head->zone = zone;
- rh->proc = &handle_delegation_result_ns_get_auth;
- rh->proc_cls = (void*)nah;
-
- nah->proc = proc;
- nah->proc_cls = proc_cls;
- strcpy (nah->result, "");
-
- /* Start delegation resolution in our namestore */
- resolve_delegation_ns(rh);
-
-}
-/******** END GET AUTHORITY *************/
/* end of gnunet-service-gns_resolver.c */
projects / oweals / gnunet.git / blobdiff