* @brief GNUnet GNS resolver logic
* @author Martin Schanzenbach
* @author Christian Grothoff
+ *
+ * TODO:
+ * - GNS: handle CNAME records (idea: manipulate rh->name)
+ * - GNS: handle VPN records (easy)
+ * - GNS: handle special SRV names --- no delegation, direct lookup;
+ * can likely be done in 'resolver_lookup_get_next_label'.
+ * - recursive DNS resolution
+ * - shortening triggers
+ * - revocation checks (make optional: privacy!)
+ *
+ * Issues:
+ * - We currently go to the DHT simply if we find no local reply; this
+ * is incorrect; the correct rules for going to DHT are:
+ *
+ * 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
+ *
+ * - We currently never look "into" the records; for example,
+ * MX, SRV and SOA records may include ".+" that need to be
+ * handled
+ *
*/
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_dns_service.h"
#include "gnunet_resolver_service.h"
#include "gnunet_dnsparser_lib.h"
-#include "gns_protocol.h"
#include "gnunet_gns_service.h"
-#include "gns_common.h"
#include "gns.h"
#include "gnunet-service-gns_resolver.h"
#include "gnunet_vpn_service.h"
-#define DHT_OPERATION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
-
-#define GNUNET_GNS_DEFAULT_LOOKUP_TIMEOUT \
- GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
-
-#define DHT_LOOKUP_TIMEOUT DHT_OPERATION_TIMEOUT
-
-#define DHT_GNS_REPLICATION_LEVEL 5
-
-#define GNUNET_GNS_MAX_PARALLEL_LOOKUPS 500
-
-#define GNUNET_GNS_MAX_NS_TASKS 500
-
+/**
+ * Default DHT timeout for lookups.
+ */
+#define DHT_LOOKUP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
/**
- * Default DHT timeout
+ * Default timeout for DNS lookups.
*/
-#define DHT_LOOKUP_TIMEOUT DHT_OPERATION_TIMEOUT
+#define DNS_LOOKUP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
/**
* DHT replication level
*/
#define DHT_GNS_REPLICATION_LEVEL 5
+/**
+ * How deep do we allow recursions to go before we abort?
+ */
+#define MAX_RECURSION 256
+
/**
* DLL to hold the authority chain we had to pass in the resolution
struct AuthorityChain *next;
/**
- * label corresponding to the authority
+ * Resolver handle this entry in the chain belongs to.
+ */
+ struct GNS_ResolverHandle *rh;
+
+ /**
+ * label/name corresponding to the authority
*/
- char label[GNUNET_DNSPARSER_MAX_LABEL_LENGTH];
+ char *label;
/**
* #GNUNET_YES if the authority was a GNS 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];
+ char name[GNUNET_DNSPARSER_MAX_NAME_LENGTH + 1];
/**
* IP address of the DNS resolver that is authoritative.
};
+/**
+ * A result we got from DNS.
+ */
+struct DnsResult
+{
+
+ /**
+ * Kept in DLL.
+ */
+ struct DnsResult *next;
+
+ /**
+ * Kept in DLL.
+ */
+ struct DnsResult *prev;
+
+ /**
+ * Binary value stored in the DNS record (appended to this struct)
+ */
+ const void *data;
+
+ /**
+ * Expiration time for the DNS record, 0 if we didn't
+ * get anything useful (i.e. 'gethostbyname' was used).
+ */
+ uint64_t expiration_time;
+
+ /**
+ * Number of bytes in 'data'.
+ */
+ size_t data_size;
+
+ /**
+ * Type of the GNS/DNS record.
+ */
+ uint32_t record_type;
+
+};
+
+
/**
* Handle to a currenty pending resolution. On result (positive or
* negative) the #GNS_ResultProcessor is called.
*/
struct GNUNET_DNSSTUB_RequestSocket *dns_request;
+ /**
+ * Handle for standard DNS resolution, NULL if none is active.
+ */
+ struct GNUNET_RESOLVER_RequestHandle *std_resolve;
+
/**
* Pending Namestore task
*/
- struct GNUNET_NAMESTORE_QueueEntry *namestore_task;
+ struct GNUNET_NAMESTORE_QueueEntry *namestore_qe;
/**
* Heap node associated with this lookup. Used to limit number of
/**
* DLL to store the authority chain
*/
- struct AuthorityChain *authority_chain_head;
+ struct AuthorityChain *ac_head;
/**
* DLL to store the authority chain
*/
- struct AuthorityChain *authority_chain_tail;
+ struct AuthorityChain *ac_tail;
/**
* Private key of the shorten zone, NULL to not shorten.
*/
struct GNUNET_CRYPTO_EccPrivateKey *shorten_key;
+ /**
+ * ID of a task associated with the resolution process.
+ */
+ GNUNET_SCHEDULER_TaskIdentifier task_id;
+
/**
* The name to resolve
*/
- char name[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
+ char *name;
+
+ /**
+ * DLL of results we got from DNS.
+ */
+ struct DnsResult *dns_result_head;
+
+ /**
+ * DLL of results we got from DNS.
+ */
+ struct DnsResult *dns_result_tail;
/**
* Current offset in 'name' where we are resolving.
*/
int only_cached;
+ /**
+ * Desired type for the resolution.
+ */
+ int record_type;
+
+ /**
+ * We increment the loop limiter for each step in a recursive
+ * resolution. If it passes our threshold (i.e. due to
+ * self-recursion in the resolution, i.e CNAME fun), we stop.
+ */
+ unsigned int loop_limiter;
+
};
*/
char label[GNUNET_DNSPARSER_MAX_LABEL_LENGTH + 1];
+ /**
+ * Label we are currently trying out (during #perform_pseu_lookup).
+ */
+ char *current_label;
+
/**
* The zone for which we are trying to find the PSEU record.
*/
static struct GNUNET_CONTAINER_Heap *dht_lookup_heap;
/**
- * Maximum amount of parallel queries in background
+ * Maximum amount of parallel queries to the DHT
*/
static unsigned long long max_allowed_background_queries;
* even though they consist of multiple labels.
*
* Examples:
- * a.b.gads = not canonical
+ * a.b.gnu = not canonical
* a = canonical
* _foo._srv = canonical
* _f.bar = not canonical
gph->timeout_task = GNUNET_SCHEDULER_NO_TASK;
}
GNUNET_CONTAINER_DLL_remove (gph_head, gph_tail, gph);
+ GNUNET_free_non_null (gph->current_label);
GNUNET_free (gph);
}
* (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 name the name for which we need an authority
* @param rd_count the number of records with 'name'
* @param rd the record data
*/
static void
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);
+
+
+/**
+ * We obtained a result for our query to the shorten zone from
+ * the namestore. Try to decrypt.
+ *
+ * @param cls the handle to our shorten operation
+ * @param block resulting encrypted block
+ */
+static void
+process_pseu_block_ns (void *cls,
+ const struct GNUNET_NAMESTORE_Block *block)
+{
+ struct GetPseuAuthorityHandle *gph = cls;
+ struct GNUNET_CRYPTO_EccPublicKey pub;
+
+ gph->namestore_task = NULL;
+ if (NULL == block)
+ {
+ process_pseu_lookup_ns (gph, 0, NULL);
+ return;
+ }
+ GNUNET_CRYPTO_ecc_key_get_public (&gph->shorten_zone_key,
+ &pub);
+ if (GNUNET_OK !=
+ GNUNET_NAMESTORE_block_decrypt (block,
+ &pub,
+ gph->current_label,
+ &process_pseu_lookup_ns,
+ gph))
+ {
+ GNUNET_break (0);
+ free_get_pseu_authority_handle (gph);
+ return;
+ }
+}
+
+
+/**
+ * Lookup in the namestore for the shorten zone the given label.
+ *
+ * @param gph the handle to our shorten operation
+ * @param label the label to lookup
+ */
+static void
+perform_pseu_lookup (struct GetPseuAuthorityHandle *gph,
+ const char *label)
+{
+ struct GNUNET_CRYPTO_EccPublicKey pub;
+ struct GNUNET_HashCode query;
+
+ GNUNET_CRYPTO_ecc_key_get_public (&gph->shorten_zone_key,
+ &pub);
+ GNUNET_free_non_null (gph->current_label);
+ gph->current_label = GNUNET_strdup (label);
+ GNUNET_NAMESTORE_query_from_public_key (&pub,
+ label,
+ &query);
+ gph->namestore_task = GNUNET_NAMESTORE_lookup_block (namestore_handle,
+ &query,
+ &process_pseu_block_ns,
+ gph);
+}
+
+
+/**
+ * Namestore calls this function if we have record for this name.
+ * (or with rd_count=0 to indicate no matches).
+ *
+ * @param cls the pending query
+ * @param rd_count the number of records with 'name'
+ * @param rd the record data
+ */
+static void
+process_pseu_lookup_ns (void *cls,
unsigned int rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd)
{
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"Name `%s' already taken, cannot shorten.\n",
- name);
+ gph->current_label);
/* 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,
+ if (0 == strcmp (gph->current_label,
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);
+ {
+ perform_pseu_lookup (gph, gph->label);
+ }
return;
}
/* name is available */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Shortening `%s' to `%s'\n",
GNUNET_NAMESTORE_z2s (&gph->target_zone),
- name);
+ gph->current_label);
new_pkey.expiration_time = UINT64_MAX;
new_pkey.data_size = sizeof (struct GNUNET_CRYPTO_EccPublicKey);
new_pkey.data = &gph->target_zone;
gph->namestore_task
= GNUNET_NAMESTORE_records_store (namestore_handle,
&gph->shorten_zone_key,
- name,
+ gph->current_label,
1, &new_pkey,
&create_pkey_cont, gph);
}
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);
+ perform_pseu_lookup (gph, gph->label);
return;
- }
-
+ }
/* 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);
+ perform_pseu_lookup (gph, pseu);
}
/* ************************** Resolution **************************** */
#if 0
-/**
- * Helper function to free resolver handle
- *
- * @param rh the handle to free
- */
-static void
-free_resolver_handle (struct ResolverHandle* rh)
-{
- struct AuthorityChain *ac;
- struct AuthorityChain *ac_next;
-
- if (NULL == rh)
- return;
-
- ac_next = rh->authority_chain_head;
- while (NULL != (ac = ac_next))
- {
- ac_next = 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;
- }
- 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));
- 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
+ * VPN redirect result callback
*
- * @param cls the closure
- * @param success GNUNET_OK on success
- * @param emsg the error message. NULL if SUCCESS==GNUNET_OK
+ * @param cls the resolver handle
+ * @param af the requested address family
+ * @param address in_addr(6) respectively
*/
-void
-on_namestore_record_put_result (void *cls,
- int32_t success,
- const char *emsg)
+static void
+process_record_result_vpn (void* cls, int af, const void *address)
{
- struct NamestoreBGTask *nbg = cls;
-
- GNUNET_CONTAINER_heap_remove_node (nbg->node);
- GNUNET_free (nbg);
+ struct ResolverHandle *rh = cls;
+ struct RecordLookupHandle *rlh = rh->proc_cls;
+ struct GNUNET_NAMESTORE_RecordData rd;
- if (GNUNET_NO == success)
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC_VPN-%llu: Got answer from VPN to query!\n",
+ rh->id);
+ if (AF_INET == af)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_NS: records already in namestore\n");
+ "GNS_PHASE_REC-%llu: Answer is IPv4!\n",
+ rh->id);
+ 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->id);
+ rh->proc (rh->proc_cls, rh, 0, NULL);
+ return;
+ }
+ 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);
+ rd.flags = 0;
+ rh->proc (rh->proc_cls, rh, 1, &rd);
return;
}
- else if (GNUNET_YES == success)
+ else if (AF_INET6 == af)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_NS: records successfully put in namestore\n");
+ "GNS_PHASE_REC-%llu: Answer is IPv6!\n",
+ rh->id);
+ 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->id);
+ rh->proc (rh->proc_cls, rh, 0, NULL);
+ return;
+ }
+ 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);
+ rd.flags = 0;
+ rh->proc (rh->proc_cls, rh, 1, &rd);
return;
}
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "GNS_NS: Error putting records into namestore: %s\n", emsg);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC-%llu: Got garbage from VPN!\n",
+ rh->id);
+ rh->proc (rh->proc_cls, rh, 0, NULL);
}
+
+
+
/**
- * Function called when we get a result from the dht
- * for our record query
+ * The final phase of resoution.
+ * We found a VPN RR and want to request an IPv4/6 address
*
- * @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
+ * @param rh the pending lookup handle
+ * @param rd_count length of record data
+ * @param rd record data containing VPN RR
*/
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)
+resolve_record_vpn (struct ResolverHandle *rh,
+ unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd)
{
- struct ResolverHandle *rh = cls;
struct RecordLookupHandle *rlh = rh->proc_cls;
- const struct GNSNameRecordBlock *nrb = data;
- uint32_t num_records;
- 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);
- rh->dht_heap_node = NULL;
- }
- if (rh->timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ struct GNUNET_HashCode serv_desc;
+ struct GNUNET_TUN_GnsVpnRecord* vpn;
+ int af;
+
+ /* We cancel here as to not include the ns lookup in the timeout */
+ if (GNUNET_SCHEDULER_NO_TASK != rh->timeout_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 = (const char*) &nrb[1];
- num_records = ntohl (nrb->rd_count);
+ /* Start shortening */
+ if ((NULL != rh->priv_key) &&
+ (GNUNET_YES == is_canonical (rh->name)))
{
- struct GNUNET_NAMESTORE_RecordData rd[num_records];
- struct NamestoreBGTask *ns_heap_root;
- struct NamestoreBGTask *namestore_bg_task;
-
- 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);
- rh->proc (rh->proc_cls, rh, 0, NULL);
- return;
- }
- 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);
-
- if ((strcmp (name, rh->name) == 0) &&
- (rd[i].record_type == rlh->record_type))
- rh->answered++;
-
- }
-
- /**
- * FIXME check pubkey against existing key in namestore?
- * https://gnunet.org/bugs/view.php?id=2179
- */
- if (max_allowed_ns_tasks <=
- GNUNET_CONTAINER_heap_get_size (ns_task_heap))
- {
- 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);
- }
-
- /* 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,
- name,
- exp,
- num_records,
- rd,
- &nrb->signature,
- &on_namestore_record_put_result, //cont
- namestore_bg_task);
-
- namestore_bg_task->node = GNUNET_CONTAINER_heap_insert (ns_task_heap,
- namestore_bg_task,
- 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);
+ "GNS_PHASE_REC_VPN-%llu: Trying to shorten authority chain\n",
+ rh->id);
+ start_shorten (rh->authority_chain_head,
+ rh->priv_key);
}
-}
-
-
-/**
- * Start DHT lookup for a (name -> query->record_type) record in
- * rh->authority's zone
- *
- * @param rh the pending gns query context
- */
-static void
-resolve_record_dht (struct ResolverHandle *rh)
-{
- struct RecordLookupHandle *rlh = rh->proc_cls;
- uint32_t xquery;
- struct GNUNET_HashCode lookup_key;
- struct ResolverHandle *rh_heap_root;
-
- 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->dht_heap_node = NULL;
-
- if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != rh->timeout.rel_value_us)
- {
- /**
- * Update timeout if necessary
- */
- if (GNUNET_SCHEDULER_NO_TASK == rh->timeout_task)
- {
- 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_cont = &dht_lookup_timeout;
- rh->timeout_cont_cls = rh;
- }
- else
- {
- if (max_allowed_background_queries <=
- 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);
- rh_heap_root->get_handle = NULL;
- rh_heap_root->dht_heap_node = NULL;
-
- 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->dht_heap_node = GNUNET_CONTAINER_heap_insert (dht_lookup_heap,
- rh,
- GNUNET_TIME_absolute_get ().abs_value_us);
- }
-
- 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_DEMULTIPLEX_EVERYWHERE,
- &xquery,
- sizeof (xquery),
- &process_record_result_dht,
- rh);
-
-}
-
-
-/**
- * Namestore calls this function if we have record for this name.
- * (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_record_result_ns (void* cls,
- const struct GNUNET_CRYPTO_EccPublicKey *key,
- struct GNUNET_TIME_Absolute expiration,
- const char *name, unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_EccSignature *signature)
-{
- struct 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->namestore_task = NULL;
- GNUNET_CRYPTO_short_hash (key,
- sizeof (struct GNUNET_CRYPTO_EccPublicKey),
- &zone);
- remaining_time = GNUNET_TIME_absolute_get_remaining (expiration);
- rh->status = 0;
- if (NULL != name)
- {
- rh->status |= RSL_RECORD_EXISTS;
- if (remaining_time.rel_value_us == 0)
- rh->status |= RSL_RECORD_EXPIRED;
- }
- if (0 == rd_count)
- {
- /**
- * Lookup terminated and no results
- */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: Namestore lookup for %s terminated without results\n",
- rh->id, name);
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: Record %s unknown in namestore\n",
- rh->id, rh->name);
- /**
- * Our zone and no result? Cannot resolve TT
- */
- rh->proc(rh->proc_cls, rh, 0, NULL);
- return;
-
- }
- 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;
- }
-
- //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: This record is expired. Skipping\n",
- rh->id);
- continue;
- }
- rh->answered++;
- }
-
- /**
- * 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
- *
- * @param cls the resolver handle
- * @param af the requested address family
- * @param address in_addr(6) respectively
- */
-static void
-process_record_result_vpn (void* cls, int af, const void *address)
-{
- struct ResolverHandle *rh = cls;
- struct RecordLookupHandle *rlh = rh->proc_cls;
- struct GNUNET_NAMESTORE_RecordData rd;
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC_VPN-%llu: Got answer from VPN to query!\n",
- rh->id);
- if (AF_INET == af)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: Answer is IPv4!\n",
- rh->id);
- 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->id);
- rh->proc (rh->proc_cls, rh, 0, NULL);
- return;
- }
- 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);
- rd.flags = 0;
- rh->proc (rh->proc_cls, rh, 1, &rd);
- return;
- }
- else if (AF_INET6 == af)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: Answer is IPv6!\n",
- rh->id);
- 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->id);
- rh->proc (rh->proc_cls, rh, 0, NULL);
- return;
- }
- 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);
- rd.flags = 0;
- rh->proc (rh->proc_cls, rh, 1, &rd);
- return;
- }
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: Got garbage from VPN!\n",
- rh->id);
- rh->proc (rh->proc_cls, rh, 0, NULL);
-}
-#endif
-
-
-/**
- * Process VPN lookup result for record
- *
- * @param cls the record lookup handle
- * @param rh resolver handle
- * @param rd_count number of results (1)
- * @param rd record data containing the result
- */
-static void
-handle_record_vpn (void* cls, struct ResolverHandle *rh,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
-{
- struct RecordLookupHandle* rlh = cls;
-
- if (0 == rd_count)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC_VPN-%llu: VPN returned no records. (status: %d)!\n",
- rh->id,
- rh->status);
- /* give up, cannot resolve */
- finish_lookup(rh, rlh, 0, NULL);
- return;
- }
-
- /* results found yay */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC_VPN-%llu: Record resolved from VPN!\n",
- rh->id);
-
- finish_lookup(rh, rlh, rd_count, rd);
-}
-
-
-/**
- * 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,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
-{
- struct RecordLookupHandle *rlh = rh->proc_cls;
- 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;
-
- memset (&packet, 0, sizeof (struct GNUNET_DNSPARSER_Packet));
- memset (rh->dns_name, 0, sizeof (rh->dns_name));
-
- /* We cancel here as to not include the ns lookup in the timeout */
- if (GNUNET_SCHEDULER_NO_TASK != rh->timeout_task)
- {
- GNUNET_SCHEDULER_cancel(rh->timeout_task);
- rh->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- }
- /* Start shortening */
- if ((NULL != rh->priv_key) &&
- (GNUNET_YES == 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_head,
- rh->priv_key);
- }
-
- for (i = 0; i < rd_count; i++)
- {
- /* 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));
- }
-
- 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)
- {
- 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),
- 0))
- {
- 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;
- }
- query.name = rh->dns_name;
- query.type = rlh->record_type;
- query.class = GNUNET_DNSPARSER_CLASS_INTERNET;
- memset (&flags, 0, sizeof (flags));
- flags.recursion_desired = 1;
- flags.checking_disabled = 1;
- packet.queries = &query;
- packet.answers = NULL;
- packet.authority_records = NULL;
- packet.num_queries = 1;
- packet.num_answers = 0;
- packet.num_authority_records = 0;
- packet.num_additional_records = 0;
- packet.flags = flags;
- packet.id = rh->id;
- if (GNUNET_OK != GNUNET_DNSPARSER_pack (&packet,
- UINT16_MAX,
- &rh->dns_raw_packet,
- &rh->dns_raw_packet_size))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC_DNS-%llu: Creating raw dns packet!\n",
- rh->id);
- GNUNET_NETWORK_socket_close (rh->dns_sock);
- finish_lookup (rh, rlh, 0, NULL);
- return;
- }
-
- rh->dns_addr.sin_family = AF_INET;
- rh->dns_addr.sin_port = htons (53); //domain
- rh->dns_addr.sin_addr = dnsip;
-#if HAVE_SOCKADDR_IN_SIN_LEN
- rh->dns_addr.sin_len = (u_char) sizeof (struct sockaddr_in);
-#endif
- send_dns_packet (rh);
-}
-
-
-/**
- * The final phase of resoution.
- * We found a VPN RR and want to request an IPv4/6 address
- *
- * @param rh the pending lookup handle
- * @param rd_count length of record data
- * @param rd record data containing VPN RR
- */
-static void
-resolve_record_vpn (struct ResolverHandle *rh,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
-{
- struct RecordLookupHandle *rlh = rh->proc_cls;
- struct GNUNET_HashCode serv_desc;
- struct vpn_data* vpn;
- int af;
-
- /* We cancel here as to not include the ns lookup in the timeout */
- if (GNUNET_SCHEDULER_NO_TASK != rh->timeout_task)
- {
- GNUNET_SCHEDULER_cancel(rh->timeout_task);
- rh->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- }
- /* Start shortening */
- 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_head,
- rh->priv_key);
- }
-
- vpn = (struct vpn_data*)rd->data;
- GNUNET_CRYPTO_hash ((char*)&vpn[1],
- strlen ((char*)&vpn[1]) + 1,
- &serv_desc);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC_VPN-%llu: proto %hu peer %s!\n",
- rh->id,
- ntohs (vpn->proto),
- GNUNET_h2s (&vpn->peer));
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC_VPN-%llu: service %s -> %s!\n",
- rh->id,
- (char*)&vpn[1],
- GNUNET_h2s (&serv_desc));
- rh->proc = &handle_record_vpn;
- if (GNUNET_DNSPARSER_TYPE_A == rlh->record_type)
- af = AF_INET;
- else
- af = AF_INET6;
-#ifndef WINDOWS
- if (NULL == vpn_handle)
- {
- vpn_handle = GNUNET_VPN_connect (cfg);
- if (NULL == vpn_handle)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_INIT: Error connecting to VPN!\n");
- finish_lookup (rh, rh->proc_cls, 0, NULL);
- return;
- }
- }
-
- rh->vpn_handle = GNUNET_VPN_redirect_to_peer (vpn_handle,
- af, ntohs (vpn->proto),
- (struct GNUNET_PeerIdentity *)&vpn->peer,
- &serv_desc,
- GNUNET_NO, //nac
- 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.
- * Query namestore for this record
- *
- * @param rh the pending lookup handle
- */
-static void
-resolve_record_ns(struct ResolverHandle *rh)
-{
- struct RecordLookupHandle *rlh = rh->proc_cls;
-
- /* We cancel here as to not include the ns lookup in the timeout */
- if (GNUNET_SCHEDULER_NO_TASK != rh->timeout_task)
- {
- GNUNET_SCHEDULER_cancel(rh->timeout_task);
- rh->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- }
- /* Start shortening */
- 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_head,
- rh->priv_key);
- }
-
- /**
- * Try to resolve this record in our namestore.
- * The name to resolve is now in rh->authority_name
- * since we tried to resolve it to an authority
- * and failed.
- **/
- rh->namestore_task = GNUNET_NAMESTORE_lookup_record(namestore_handle,
- &rh->authority,
- rh->name,
- rlh->record_type,
- &process_record_result_ns,
- rh);
-}
-
-
-/**
- * Handle timeout for DHT requests
- *
- * @param cls the request handle as closure
- * @param tc the task context
- */
-static void
-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[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
-
- 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 (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);
- return;
- }
- 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);
- return;
- }
-
- /**
- * Start resolution in bg
- */
- 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);
-}
-
-
-/**
- * This is a callback function that checks for key revocation
- *
- * @param cls the pending query
- * @param key the key of the zone we did the lookup
- * @param expiration expiration date of the record data set in the namestore
- * @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_pkey_revocation_result_ns (void *cls,
- const struct GNUNET_CRYPTO_EccPublicKey *key,
- struct GNUNET_TIME_Absolute expiration,
- const char *name,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_EccSignature *signature)
-{
- struct ResolverHandle *rh = cls;
- struct GNUNET_TIME_Relative remaining_time;
- int i;
-
- rh->namestore_task = NULL;
- remaining_time = GNUNET_TIME_absolute_get_remaining (expiration);
-
- for (i = 0; i < rd_count; i++)
- {
- 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",
- rh->id);
- rh->status |= RSL_PKEY_REVOKED;
- rh->proc (rh->proc_cls, rh, 0, NULL);
- return;
- }
- }
-
- 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 (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, "+.gads", GNUNET_NAMESTORE_TYPE_REV);
-
- gns_resolver_lookup_record(rh->authority,
- rh->private_local_zone,
- GNUNET_NAMESTORE_TYPE_REV,
- GNUNET_GNS_TLD,
- NULL,
- GNUNET_TIME_UNIT_FOREVER_REL,
- GNUNET_NO,
- &background_lookup_result_processor,
- NULL);
- }
- }
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_REV-%llu: Revocation check passed\n",
- rh->id);
- /**
- * We are done with PKEY resolution if name is empty
- * else resolve again with new authority
- */
- if (strcmp (rh->name, "") == 0)
- rh->proc (rh->proc_cls, rh, rh->rd_count, &rh->rd);
- else
- resolve_delegation_ns (rh);
-}
-
-
-/**
- * Callback when record data is put into namestore
- *
- * @param cls the closure
- * @param success GNUNET_OK on success
- * @param emsg the error message. NULL if SUCCESS==GNUNET_OK
- */
-static void
-on_namestore_delegation_put_result(void *cls,
- int32_t success,
- const char *emsg)
-{
- struct NamestoreBGTask *nbg = cls;
-
- GNUNET_CONTAINER_heap_remove_node (nbg->node);
- GNUNET_free (nbg);
-
- if (GNUNET_NO == success)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_NS: records already in namestore\n");
- return;
- }
- else if (GNUNET_YES == success)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_NS: records successfully put in namestore\n");
- return;
- }
-
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "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
- * for name in DHT.
- *
- * @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_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 = cls;
- const struct GNSNameRecordBlock *nrb = data;
- const char* rd_data;
- uint32_t num_records;
- const char* name;
- uint32_t i;
- int rd_size;
- struct GNUNET_CRYPTO_ShortHashCode zone;
+ vpn = (struct GNUNET_TUN_GnsVpnRecord*)rd->data;
+ GNUNET_CRYPTO_hash ((char*)&vpn[1],
+ strlen ((char*)&vpn[1]) + 1,
+ &serv_desc);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_DHT-%llu: Got DHT result\n",
- rh->id);
- if (data == NULL)
- return;
- /* 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);
- rh->dht_heap_node = NULL;
- }
+ "GNS_PHASE_REC_VPN-%llu: proto %hu peer %s!\n",
+ rh->id,
+ ntohs (vpn->proto),
+ GNUNET_h2s (&vpn->peer));
- num_records = ntohl(nrb->rd_count);
- name = (const char*) &nrb[1];
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC_VPN-%llu: service %s -> %s!\n",
+ rh->id,
+ (char*)&vpn[1],
+ GNUNET_h2s (&serv_desc));
+ rh->proc = &handle_record_vpn;
+ if (GNUNET_DNSPARSER_TYPE_A == rlh->record_type)
+ af = AF_INET;
+ else
+ af = AF_INET6;
+#ifndef WINDOWS
+ if (NULL == vpn_handle)
{
- struct GNUNET_NAMESTORE_RecordData rd[num_records];
- struct NamestoreBGTask *ns_heap_root;
- struct NamestoreBGTask *namestore_bg_task;
-
- 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_DELEGATE_DHT-%llu: Error deserializing data!\n",
- rh->id);
- return;
- }
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_DHT-%llu: Got name: %s (wanted %s)\n",
- rh->id, name, rh->authority_name);
- for (i=0; i<num_records; i++)
+ vpn_handle = GNUNET_VPN_connect (cfg);
+ if (NULL == vpn_handle)
{
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_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);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_DHT-%llu: Got flag %d\n",
- rh->id, rd[i].flags);
-
- 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 (0 == strcmp(rh->name, ""))
- strcpy(rh->name, rh->authority_name);
- else
- GNUNET_snprintf(rh->name, GNUNET_DNSPARSER_MAX_NAME_LENGTH, "%s.%s",
- rh->name, rh->authority_name); //FIXME ret
- rh->answered = 1;
- break;
- }
-
- 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",
- rh->id);
- rh->answered = 1;
- 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;
-
- /** try to import pkey if private key available */
- //if (rh->priv_key && is_canonical (rh->name))
- // process_discovered_authority(name, auth->zone,
- // rh->authority_chain_tail->zone,
- // rh->priv_key);
- }
-
- }
- GNUNET_GNS_get_zone_from_key (name, key, &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))
- {
- 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_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_us);
- namestore_bg_task->qe = GNUNET_NAMESTORE_record_put (namestore_handle,
- &nrb->public_key,
- name,
- exp,
- num_records,
- rd,
- &nrb->signature,
- &on_namestore_delegation_put_result, //cont
- namestore_bg_task); //cls
- }
- //}
-
- if (0 != rh->answered)
- {
- rh->answered = 0;
- /**
- * delegate
- * FIXME in this case. should we ask namestore again?
- */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_DHT-%llu: Answer from DHT for %s. Yet to resolve: %s\n",
- rh->id, rh->authority_name, rh->name);
-
- if (0 == strcmp(rh->name, ""))
- {
- /* Start shortening */
- 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_head,
- rh->priv_key);
- }
+ "GNS_PHASE_INIT: Error connecting to VPN!\n");
+ finish_lookup (rh, rh->proc_cls, 0, NULL);
+ return;
}
- else
- rh->proc = &handle_delegation_ns;
-
-
- /* 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;
}
-
- /**
- * No pkey but name exists
- * promote back
- */
- 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 (0 == strcmp(rh->name, ""))
- strcpy(rh->name, rh->authority_name);
- else
- GNUNET_snprintf(rh->name, GNUNET_DNSPARSER_MAX_NAME_LENGTH, "%s.%s",
- rh->name, rh->authority_name); //FIXME ret
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_DHT-%llu: %s restored\n", rh->id, rh->name);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_DHT-%llu: DHT authority lookup found no match!\n",
- rh->id);
- rh->proc(rh->proc_cls, rh, 0, NULL);
+
+ rh->vpn_handle = GNUNET_VPN_redirect_to_peer (vpn_handle,
+ af, ntohs (vpn->proto),
+ (struct GNUNET_PeerIdentity *)&vpn->peer,
+ &serv_desc,
+ GNUNET_NO, //nac
+ 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
}
+
//FIXME maybe define somewhere else?
#define MAX_SOA_LENGTH sizeof(uint32_t)+sizeof(uint32_t)+sizeof(uint32_t)+sizeof(uint32_t)\
+(GNUNET_DNSPARSER_MAX_NAME_LENGTH*2)
char new_mx_data[MAX_MX_LENGTH];
char new_soa_data[MAX_SOA_LENGTH];
char new_srv_data[MAX_SRV_LENGTH];
- struct srv_data *old_srv;
- struct srv_data *new_srv;
- struct soa_data *old_soa;
- struct soa_data *new_soa;
+ struct GNUNET_TUN_DnsSrvRecord *old_srv;
+ struct GNUNET_TUN_DnsSrvRecord *new_srv;
+ struct GNUNET_TUN_DnsSoaRecord *old_soa;
+ struct GNUNET_TUN_DnsSoaRecord *new_soa;
struct GNUNET_NAMESTORE_RecordData p_rd[rd_count];
char* repl_string;
char* pos;
/*
* Prio, weight and port
*/
- new_srv = (struct srv_data*)new_srv_data;
- old_srv = (struct srv_data*)rd[i].data;
+ new_srv = (struct GNUNET_TUN_DnsSrvRecord*)new_srv_data;
+ old_srv = (struct GNUNET_TUN_DnsSrvRecord*)rd[i].data;
new_srv->prio = old_srv->prio;
new_srv->weight = old_srv->weight;
new_srv->port = old_srv->port;
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;
+ p_rd[i].data_size = sizeof (struct GNUNET_TUN_DnsSrvRecord) + strlen ((char*)&new_srv[1]) + 1;
}
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));
+ old_soa = (struct GNUNET_TUN_DnsSoaRecord*)rd[i].data;
+ new_soa = (struct GNUNET_TUN_DnsSoaRecord*)new_soa_data;
+ memcpy (new_soa, old_soa, sizeof (struct GNUNET_TUN_DnsSoaRecord));
// 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;
expand_plus((char*)&new_soa[1] + offset,
(char*)&old_soa[1] + strlen ((char*)&old_soa[1]) + 1,
repl_string);
- p_rd[i].data_size = sizeof (struct soa_data)
+ p_rd[i].data_size = sizeof (struct GNUNET_TUN_DnsSoaRecord)
+ offset
+ strlen ((char*)&new_soa[1] + offset);
p_rd[i].data = new_soa_data;
}
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+
/**
- * Process DHT lookup result for record.
+ * Task scheduled to asynchronously fail a resolution.
*
- * @param cls the closure
- * @param rh resolver handle
- * @param rd_count number of results
- * @param rd record data
+ * @param cls the 'struct GNS_ResolverHandle' of the resolution to fail
+ * @param tc task context
*/
static void
-handle_record_dht (void* cls, struct ResolverHandle *rh,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+fail_resolution (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct RecordLookupHandle* rlh = cls;
+ struct GNS_ResolverHandle *rh = cls;
- if (0 == rd_count)
- {
- 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);
- return;
- }
- /* results found yay */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC-%llu: Record resolved from DHT!", rh->id);
- finish_lookup (rh, rlh, rd_count, rd);
+ rh->task_id = GNUNET_SCHEDULER_NO_TASK;
+ rh->proc (rh->proc_cls, 0, NULL);
+ GNS_resolver_lookup_cancel (rh);
}
+#ifdef WINDOWS
+/* Don't have this on W32, here's a naive implementation */
+void *memrchr (const void *s, int c, size_t n)
+{
+ size_t i;
+ unsigned char *ucs = (unsigned char *) s;
+ for (i = n - 1; i >= 0; i--)
+ if (ucs[i] == c)
+ return (void *) &ucs[i];
+ return NULL;
+}
+#endif
/**
- * Process namestore lookup result for record.
+ * Get the next, rightmost label from the name that we are trying to resolve,
+ * and update the resolution position accordingly.
*
- * @param cls the closure
- * @param rh resolver handle
- * @param rd_count number of results
- * @param rd record data
+ * @param rh handle to the resolution operation to get the next label from
+ * @return NULL if there are no more labels
*/
-static void
-handle_record_ns (void* cls, struct ResolverHandle *rh,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+static char *
+resolver_lookup_get_next_label (struct GNS_ResolverHandle *rh)
{
- struct RecordLookupHandle* rlh = cls;
- int check_dht = GNUNET_YES;
-
- 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: 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))
- {
-
- 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;
+ const char *rp;
+ const char *dot;
+ size_t len;
- if (GNUNET_YES == rh->only_cached)
- check_dht = GNUNET_NO;
-
- if (GNUNET_YES == check_dht)
+ if (0 == rh->name_resolution_pos)
+ return NULL;
+ dot = memrchr (rh->name, (int) '.', rh->name_resolution_pos);
+ if (NULL == dot)
{
- rh->proc = &handle_record_dht;
- resolve_record_dht(rh);
- return;
+ /* done, this was the last one */
+ len = rh->name_resolution_pos;
+ rp = rh->name;
+ rh->name_resolution_pos = 0;
}
- /* give up, cannot resolve */
- finish_lookup (rh, rlh, 0, NULL);
+ else
+ {
+ /* advance by one label */
+ len = rh->name_resolution_pos - (dot - rh->name) - 1;
+ rp = dot + 1;
+ rh->name_resolution_pos = dot - rh->name;
+ }
+ return GNUNET_strndup (rp, len);
}
/**
- * Move one level up in the domain hierarchy and return the
- * passed top level domain.
+ * Gives the cummulative result obtained to the callback and clean up the request.
*
- * 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
+ * @param rh resolution process that has culminated in a result
*/
static void
-pop_tld (char* name, char* dest)
+transmit_lookup_dns_result (struct GNS_ResolverHandle *rh)
{
- uint32_t len;
+ struct DnsResult *pos;
+ unsigned int n;
+ unsigned int i;
- if (GNUNET_YES == is_canonical (name))
+ n = 0;
+ for (pos = rh->dns_result_head; NULL != pos; pos = pos->next)
+ n++;
{
- strcpy (dest, name);
- strcpy (name, "");
- return;
- }
+ struct GNUNET_NAMESTORE_RecordData rd[n];
- for (len = strlen(name); 0 < len; len--)
- {
- if (*(name+len) == '.')
- break;
+ i = 0;
+ for (pos = rh->dns_result_head; NULL != pos; pos = pos->next)
+ {
+ rd[i].data = pos->data;
+ rd[i].data_size = pos->data_size;
+ rd[i].record_type = pos->record_type;
+ if (0 == pos->expiration_time)
+ {
+ rd[i].flags = GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION;
+ rd[i].expiration_time = 0;
+ }
+ else
+ {
+ rd[i].flags = GNUNET_NAMESTORE_RF_NONE;
+ rd[i].expiration_time = pos->expiration_time;
+ }
+ }
+ rh->proc (rh->proc_cls,
+ n,
+ rd);
}
-
- //Was canonical?
- if (0 == len)
- return;
- name[len] = '\0';
- strcpy (dest, (name+len+1));
+ GNS_resolver_lookup_cancel (rh);
}
/**
- * DHT resolution for delegation finished. Processing result.
+ * Add a result from DNS to the records to be returned to the application.
*
- * @param cls the closure
- * @param rh resolver handle
- * @param rd_count number of results (always 0)
- * @param rd record data (always NULL)
+ * @param rh resolution request to extend with a result
+ * @param expiration_time expiration time for the answer
+ * @param record_type DNS record type of the answer
+ * @param data_size number of bytes in @a data
+ * @param data binary data to return in DNS record
*/
static void
-handle_delegation_dht(void* cls, struct ResolverHandle *rh,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+add_dns_result (struct GNS_ResolverHandle *rh,
+ uint64_t expiration_time,
+ uint32_t record_type,
+ size_t data_size,
+ const void *data)
{
- struct RecordLookupHandle* rlh = cls;
-
- if (0 == strcmp(rh->name, ""))
- {
- 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",
- rh->id);
- finish_lookup(rh, rlh, rd_count, rd);
- return;
- }
- /* We resolved full name for delegation. resolving record */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_DHT-%llu: Resolved full name for delegation via DHT.\n",
- rh->id);
- strcpy(rh->name, "+\0");
- rh->proc = &handle_record_ns;
- resolve_record_ns(rh);
- return;
- }
-
- /**
- * we still have some left
- **/
- 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",
- rh->id,
- rh->name);
- rh->proc = &handle_record_ns;
- resolve_record_ns(rh);
- return;
- }
- /* give up, cannot resolve */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_DHT-%llu: Cannot fully resolve delegation for %s via DHT!\n",
- rh->id, rh->name);
- finish_lookup(rh, rlh, 0, NULL);
+ struct DnsResult *res;
+
+ res = GNUNET_malloc (sizeof (struct DnsResult) + data_size);
+ res->expiration_time = expiration_time;
+ res->data_size = data_size;
+ res->record_type = record_type;
+ res->data = &res[1];
+ memcpy (&res[1], data, data_size);
+ GNUNET_CONTAINER_DLL_insert (rh->dns_result_head,
+ rh->dns_result_tail,
+ res);
}
/**
- * Start DHT lookup for a name -> PKEY (compare NS) record in
- * rh->authority's zone
+ * We had to do a DNS lookup. Convert the result (if any) and return
+ * it.
*
- * @param rh the pending gns query
+ * @param cls closure with the 'struct GNS_ResolverHandle'
+ * @param addr one of the addresses of the host, NULL for the last address
+ * @param addrlen length of the address
*/
static void
-resolve_delegation_dht (struct ResolverHandle *rh)
+handle_dns_result (void *cls,
+ const struct sockaddr *addr,
+ socklen_t addrlen)
{
- uint32_t xquery;
- struct GNUNET_HashCode lookup_key;
- struct ResolverHandle *rh_heap_root;
-
- 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_us != GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us)
+ struct GNS_ResolverHandle *rh = cls;
+ const struct sockaddr_in *sa4;
+ const struct sockaddr_in6 *sa6;
+
+ rh->std_resolve = NULL;
+ if (NULL == addr)
{
- rh->timeout_cont = &dht_authority_lookup_timeout;
- rh->timeout_cont_cls = rh;
+ transmit_lookup_dns_result (rh);
+ return;
}
- else
- {
- if (max_allowed_background_queries <=
- GNUNET_CONTAINER_heap_get_size (dht_lookup_heap))
- {
- /* terminate oldest lookup */
- rh_heap_root = GNUNET_CONTAINER_heap_remove_root (dht_lookup_heap);
- 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);
- }
- rh->dht_heap_node = GNUNET_CONTAINER_heap_insert (dht_lookup_heap,
- rh,
- GNUNET_TIME_absolute_get().abs_value_us);
+ switch (addr->sa_family)
+ {
+ case AF_INET:
+ sa4 = (const struct sockaddr_in *) addr;
+ add_dns_result (rh,
+ 0 /* expiration time is unknown */,
+ GNUNET_DNSPARSER_TYPE_A,
+ sizeof (struct in_addr),
+ &sa4->sin_addr);
+ break;
+ case AF_INET6:
+ sa6 = (const struct sockaddr_in6 *) addr;
+ add_dns_result (rh,
+ 0 /* expiration time is unknown */,
+ GNUNET_DNSPARSER_TYPE_AAAA,
+ sizeof (struct in6_addr),
+ &sa6->sin6_addr);
+ break;
+ default:
+ GNUNET_break (0);
+ break;
}
- 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);
}
/**
- * Namestore resolution for delegation finished. Processing result.
+ * Task scheduled to continue with the resolution process.
*
- * @param cls the closure
- * @param rh resolver handle
- * @param rd_count number of results (always 0)
- * @param rd record data (always NULL)
+ * @param cls the 'struct GNS_ResolverHandle' of the resolution
+ * @param tc task context
*/
-static void
-handle_delegation_ns (void* cls, struct ResolverHandle *rh,
- unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
-{
- 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);
-
- if (rh->status & RSL_PKEY_REVOKED)
- {
- finish_lookup (rh, rlh, 0, NULL);
- return;
- }
-
- if (0 == strcmp(rh->name, ""))
- {
-
- /* We resolved full name for delegation. resolving record */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Resolved full name for delegation.\n",
- rh->id);
- if (rh->status & RSL_CNAME_FOUND)
- {
- 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",
- rh->id);
- strcpy (rh->name, rh->authority_name);
- finish_lookup (rh, rlh, rd_count, rd);
- return;
- }
-
- /* A .+ CNAME */
- 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);
- rh->name[s_len] = '\0';
- resolve_delegation_ns (rh);
- return;
- }
- else if (GNUNET_YES == is_tld ((char*)rd->data, GNUNET_GNS_TLD_ZKEY))
- {
- gns_resolver_lookup_record (rh->authority,
- rh->private_local_zone,
- rlh->record_type,
- (char*)rd->data,
- rh->priv_key,
- rh->timeout,
- rh->only_cached,
- rlh->proc,
- rlh->proc_cls);
- GNUNET_free (rlh);
- GNUNET_CONTAINER_DLL_remove (rlh_head, rlh_tail, rh);
- free_resolver_handle (rh);
- return;
- }
- else
- {
- //Try DNS resolver
- strcpy (rh->dns_name, (char*)rd->data);
- resolve_dns_name (rh);
- return;
- }
-
- }
- else if (rh->status & RSL_DELEGATE_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",
- rh->id);
- finish_lookup(rh, rlh, rd_count, rd);
- return;
- }
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: VPN delegation starting.\n",
- rh->id);
- GNUNET_assert (NULL != rd);
- rh->proc = &handle_record_vpn;
- resolve_record_vpn (rh, rd_count, rd);
- return;
- }
- else if (rh->status & RSL_DELEGATE_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);
- return;
- }
- 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);
- return;
- }
- else if (rh->status & RSL_DELEGATE_PKEY)
- {
- if (rh->status & RSL_PKEY_REVOKED)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Resolved PKEY is revoked.\n",
- rh->id);
- finish_lookup (rh, rlh, 0, NULL);
- return;
- }
- 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",
- rh->id);
- finish_lookup(rh, rlh, rd_count, rd);
- return;
- }
- }
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Resolving record +\n",
- rh->id);
- strcpy(rh->name, "+\0");
- rh->proc = &handle_record_ns;
- resolve_record_ns(rh);
- return;
- }
-
- if (rh->status & RSL_DELEGATE_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);
- return;
- }
-
- 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);
- return;
- }
-
- /**
- * we still have some left
- * check if authority in ns is fresh
- * and exists
- * or we are authority
- **/
+static void
+recursive_resolution (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc);
- check_dht = GNUNET_YES;
- if ((rh->status & RSL_RECORD_EXISTS) &&
- !(rh->status & RSL_RECORD_EXPIRED))
- check_dht = GNUNET_NO;
- if (0 == GNUNET_CRYPTO_short_hash_cmp(&rh->authority_chain_head->zone,
- &rh->private_local_zone))
- check_dht = GNUNET_NO;
+/**
+ * Function called with the result of a DNS resolution.
+ *
+ * @param cls the request handle of the resolution that
+ * we were attempting to make
+ * @param rs socket that received the response
+ * @param dns dns response, never NULL
+ * @param dns_len number of bytes in 'dns'
+ */
+static void
+dns_result_parser (void *cls,
+ struct GNUNET_DNSSTUB_RequestSocket *rs,
+ const struct GNUNET_TUN_DnsHeader *dns,
+ size_t dns_len)
+{
+ struct GNS_ResolverHandle *rh = cls;
+ struct GNUNET_DNSPARSER_Packet *p;
+
+ rh->dns_request = NULL;
+ GNUNET_SCHEDULER_cancel (rh->task_id);
+ rh->task_id = GNUNET_SCHEDULER_NO_TASK;
+ p = GNUNET_DNSPARSER_parse ((const char *) dns,
+ dns_len);
+ if (NULL == p)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to parse DNS response\n"));
+ rh->proc (rh->proc_cls, 0, NULL);
+ GNS_resolver_lookup_cancel (rh);
+ return;
+ }
+ // FIXME:
+ // Check if the packet is the final answer, or
+ // just pointing us to another NS or another name (CNAME), or another domain (DNAME);
+ // then do the right thing (TM) -- possibly using "recursive_dns_resolution".
+ GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("NOT IMPLEMENTED\n"));
+ rh->proc (rh->proc_cls, 0, NULL);
+ GNS_resolver_lookup_cancel (rh);
- if (GNUNET_YES == rh->only_cached)
- check_dht = GNUNET_NO;
+
+ GNUNET_DNSPARSER_free_packet (p);
+}
- if (GNUNET_YES == check_dht)
- {
- 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);
+/**
+ * Perform recursive DNS resolution. Asks the given DNS resolver to
+ * resolve "rh->dns_name", possibly recursively proceeding following
+ * NS delegations, CNAMES, etc., until 'rh->loop_limiter' bounds us or
+ * we find the answer.
+ *
+ * @param rh resolution information
+ */
+static void
+recursive_dns_resolution (struct GNS_ResolverHandle *rh)
+{
+ struct AuthorityChain *ac;
+ socklen_t sa_len;
+ struct GNUNET_DNSPARSER_Query *query;
+ struct GNUNET_DNSPARSER_Packet *p;
+ char *dns_request;
+ size_t dns_request_length;
+
+ ac = rh->ac_tail;
+ GNUNET_assert (NULL != ac);
+ GNUNET_assert (GNUNET_NO == ac->gns_authority);
+ switch (((const struct sockaddr *) &ac->authority_info.dns_authority.dns_ip)->sa_family)
+ {
+ case AF_INET:
+ sa_len = sizeof (struct sockaddr_in);
+ break;
+ case AF_INET6:
+ sa_len = sizeof (struct sockaddr_in6);
+ break;
+ default:
+ GNUNET_break (0);
+ rh->proc (rh->proc_cls, 0, NULL);
+ GNS_resolver_lookup_cancel (rh);
return;
}
-
- if (GNUNET_NO == is_canonical (rh->name))
+ query = GNUNET_new (struct GNUNET_DNSPARSER_Query);
+ query->name = GNUNET_strdup (ac->label);
+ query->type = rh->record_type;
+ query->class = GNUNET_TUN_DNS_CLASS_INTERNET;
+ p = GNUNET_new (struct GNUNET_DNSPARSER_Packet);
+ p->queries = query;
+ p->num_queries = 1;
+ p->id = (uint16_t) GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE,
+ UINT16_MAX);
+ p->flags.opcode = GNUNET_TUN_DNS_OPCODE_QUERY;
+ p->flags.recursion_desired = 1;
+ if (GNUNET_OK !=
+ GNUNET_DNSPARSER_pack (p, 1024, &dns_request, &dns_request_length))
{
- /* 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_break (0);
+ rh->proc (rh->proc_cls, 0, NULL);
+ GNS_resolver_lookup_cancel (rh);
}
- 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
+ {
+ rh->dns_request = GNUNET_DNSSTUB_resolve (dns_handle,
+ (const struct sockaddr *) &ac->authority_info.dns_authority.dns_ip,
+ sa_len,
+ dns_request,
+ dns_request_length,
+ &dns_result_parser,
+ rh);
+ rh->task_id = GNUNET_SCHEDULER_add_delayed (DNS_LOOKUP_TIMEOUT,
+ &fail_resolution,
+ rh);
+ }
+ GNUNET_free (dns_request);
+ GNUNET_DNSPARSER_free_packet (p);
}
/**
- * This is a callback function that should give us only PKEY
- * records. Used to query the namestore for the authority (PKEY)
- * for 'name'. It will recursively try to resolve the
- * authority for a given name from the namestore.
+ * We encountered a CNAME record during our resolution.
+ * Merge it into our chain.
*
- * @param cls the pending query
- * @param key the key of the zone we did the lookup
- * @param expiration expiration date of the record data set in the namestore
- * @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
+ * @param rh resolution we are performing
+ * @param cname value of the cname record we got for the current
+ * authority chain tail
*/
static void
-process_delegation_result_ns (void* cls,
- const struct GNUNET_CRYPTO_EccPublicKey *key,
- struct GNUNET_TIME_Absolute expiration,
- const char *name,
+handle_gns_cname_result (struct GNS_ResolverHandle *rh,
+ const char *cname)
+{
+ // FIXME: not implemented
+ GNUNET_break (0);
+ rh->proc (rh->proc_cls, 0, NULL);
+ GNS_resolver_lookup_cancel (rh);
+}
+
+
+/**
+ * Process a records that were decrypted from a block.
+ *
+ * @param cls closure with the 'struct GNS_ResolverHandle'
+ * @param rd_count number of entries in @a rd array
+ * @param rd array of records with data to store
+ */
+static void
+handle_gns_resolution_result (void *cls,
unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_EccSignature *signature)
+ const struct GNUNET_NAMESTORE_RecordData *rd)
{
- struct ResolverHandle *rh = cls;
- struct GNUNET_TIME_Relative remaining_time;
- struct GNUNET_CRYPTO_ShortHashCode zone;
- char new_name[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
+ struct GNS_ResolverHandle *rh = cls;
+ struct AuthorityChain *ac;
unsigned int i;
- struct GNUNET_TIME_Absolute et;
- struct AuthorityChain *auth;
-
- 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 for `%s' in zone %s\n",
- rh->id, rd_count,
- name,
- GNUNET_short_h2s (&zone));
-
- remaining_time = GNUNET_TIME_absolute_get_remaining (expiration);
-
- rh->status = 0;
-
- if (NULL != name)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "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 (0 == remaining_time.rel_value_us)
+ unsigned int j;
+ struct sockaddr *sa;
+ struct sockaddr_in v4;
+ struct sockaddr_in6 v6;
+ size_t sa_len;
+ char *cname;
+
+ if (0 == rh->name_resolution_pos)
+ {
+ /* top-level match, are we done yet? */
+ if ( (rd_count > 0) &&
+ (GNUNET_DNSPARSER_TYPE_CNAME == rd[0].record_type) &&
+ (GNUNET_DNSPARSER_TYPE_CNAME != rh->record_type) )
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Record set %s expired.\n",
- rh->id, name);
- rh->status |= RSL_RECORD_EXPIRED;
+ cname = GNUNET_strndup (rd[0].data,
+ rd[0].data_size);
+ handle_gns_cname_result (rh,
+ cname);
+ GNUNET_free (cname);
+ return;
}
- }
-
- /**
- * No authority found in namestore.
- */
- if (0 == rd_count)
- {
- /**
- * We did not find an authority in the namestore
- */
+ /* FIXME: if A/AAAA was requested, but we got a VPN
+ record, we should interact with GNUnet VPN here */
- /**
- * No PKEY in zone.
- * Promote this authority back to a name maybe it is
- * our record.
- */
- if (strcmp (rh->name, "") == 0)
- {
- /* 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);
- }
- else
- {
- /* add back to existing name */
- 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, GNUNET_DNSPARSER_MAX_NAME_LENGTH, "%s.%s",
- rh->name, rh->authority_name);
- strcpy (rh->name, new_name);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: %s restored\n",
- rh->id, rh->name);
- }
-
- rh->proc (rh->proc_cls, rh, 0, NULL);
- return;
+ /* yes, we are done, return result */
+ rh->proc (rh->proc_cls, rd_count, rd);
+ GNS_resolver_lookup_cancel (rh);
+ return;
}
-
- /**
- * We found an authority that may be able to help us
- * move on with query
- * Note only 1 pkey should have been returned.. anything else would be strange
- */
- for (i=0; i < rd_count;i++)
+ /* need to recurse, check if we can */
+ for (i=0;i<rd_count;i++)
{
switch (rd[i].record_type)
{
- 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;
- 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;
- 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;
case GNUNET_NAMESTORE_TYPE_PKEY:
- rh->status |= RSL_DELEGATE_PKEY;
- if ((ignore_pending_records != 0) &&
- (rd[i].flags & GNUNET_NAMESTORE_RF_PENDING))
+ /* delegation to another zone */
+ if (sizeof (struct GNUNET_CRYPTO_EccPublicKey) !=
+ rd[i].data_size)
+ {
+ GNUNET_break_op (0);
+ rh->proc (rh->proc_cls, 0, NULL);
+ GNS_resolver_lookup_cancel (rh);
+ return;
+ }
+ /* expand authority chain */
+ ac = GNUNET_new (struct AuthorityChain);
+ ac->rh = rh;
+ ac->gns_authority = GNUNET_YES;
+ memcpy (&ac->authority_info.gns_authority,
+ rd[i].data,
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey));
+ ac->label = resolver_lookup_get_next_label (rh);
+ GNUNET_CONTAINER_DLL_insert_tail (rh->ac_head,
+ rh->ac_tail,
+ ac);
+ /* recurse */
+ rh->task_id = GNUNET_SCHEDULER_add_now (&recursive_resolution,
+ rh);
+ break;
+ case GNUNET_DNSPARSER_TYPE_NS:
+ /* resolution continues within DNS */
+ if (GNUNET_DNSPARSER_MAX_NAME_LENGTH < rd[i].data_size)
{
- 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_break_op (0);
+ rh->proc (rh->proc_cls, 0, NULL);
+ GNS_resolver_lookup_cancel (rh);
+ return;
+ }
+ /* find associated A/AAAA record */
+ sa = NULL;
+ for (j=0;j<rd_count;j++)
{
- 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)
+ switch (rd[j].record_type)
{
- 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;
+ case GNUNET_DNSPARSER_TYPE_A:
+ if (sizeof (struct in_addr) != rd[i].data_size)
+ {
+ GNUNET_break_op (0);
+ rh->proc (rh->proc_cls, 0, NULL);
+ GNS_resolver_lookup_cancel (rh);
+ return;
+ }
+ /* FIXME: might want to check if we support IPv4 here,
+ and otherwise skip this one and hope we find another */
+ memset (&v4, 0, sizeof (v4));
+ sa_len = sizeof (v4);
+ v4.sin_family = AF_INET;
+ v4.sin_port = htons (53);
+#if HAVE_SOCKADDR_IN_SIN_LEN
+ v4.sin_len = (u_char) sa_len;
+#endif
+ memcpy (&v4.sin_addr,
+ rd[j].data,
+ sizeof (struct in_addr));
+ sa = (struct sockaddr *) &v4;
+ break;
+ case GNUNET_DNSPARSER_TYPE_AAAA:
+ if (sizeof (struct in6_addr) != rd[i].data_size)
+ {
+ GNUNET_break_op (0);
+ rh->proc (rh->proc_cls, 0, NULL);
+ GNS_resolver_lookup_cancel (rh);
+ return;
+ }
+ /* FIXME: might want to check if we support IPv6 here,
+ and otherwise skip this one and hope we find another */
+ memset (&v6, 0, sizeof (v6));
+ sa_len = sizeof (v6);
+ v6.sin6_family = AF_INET6;
+ v6.sin6_port = htons (53);
+#if HAVE_SOCKADDR_IN_SIN_LEN
+ v6.sin6_len = (u_char) sa_len;
+#endif
+ memcpy (&v6.sin6_addr,
+ rd[j].data,
+ sizeof (struct in6_addr));
+ sa = (struct sockaddr *) &v6;
+ break;
+ }
+ if (NULL != sa)
+ break;
+ }
+ /* expand authority chain */
+ ac = GNUNET_new (struct AuthorityChain);
+ ac->rh = rh;
+ strncpy (ac->authority_info.dns_authority.name,
+ rd[i].data,
+ rd[i].data_size);
+ ac->authority_info.dns_authority.name[rd[i].data_size] = '\0';
+ memcpy (&ac->authority_info.dns_authority.dns_ip,
+ sa,
+ sa_len);
+ /* for DNS recursion, the label is the full DNS name,
+ created from the remainder of the GNS name and the
+ name in the NS record */
+ GNUNET_asprintf (&ac->label,
+ "%.*s%s",
+ (int) rh->name_resolution_pos,
+ rh->name,
+ ac->authority_info.dns_authority.name);
+ GNUNET_CONTAINER_DLL_insert_tail (rh->ac_head,
+ rh->ac_tail,
+ ac);
+ if (strlen (ac->label) > GNUNET_DNSPARSER_MAX_NAME_LENGTH)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("GNS lookup resulted in DNS name that is too long (`%s')\n"),
+ ac->label);
+ rh->proc (rh->proc_cls, 0, NULL);
+ GNS_resolver_lookup_cancel (rh);
+ return;
}
- /* 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);
+ /* recurse */
+ rh->task_id = GNUNET_SCHEDULER_add_now (&recursive_resolution,
+ rh);
+ return;
+ case GNUNET_DNSPARSER_TYPE_CNAME:
+ cname = GNUNET_strndup (rd[i].data,
+ rd[i].data_size);
+ handle_gns_cname_result (rh,
+ cname);
+ GNUNET_free (cname);
return;
+ /* FIXME: handle DNAME */
default:
- /* ignore, move to next result */
+ /* skip */
break;
}
}
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("GNS lookup recursion failed (no delegation record found)\n"));
+ rh->proc (rh->proc_cls, 0, NULL);
+ GNS_resolver_lookup_cancel (rh);
+}
+
+
+/**
+ * Function called once the namestore has completed the request for
+ * caching a block.
+ *
+ * @param cls closure with the 'struct GNS_ResolverHandle'
+ * @param success #GNUNET_OK on success
+ * @param emsg error message
+ */
+static void
+namestore_cache_continuation (void *cls,
+ int32_t success,
+ const char *emsg)
+{
+ struct GNS_ResolverHandle *rh = cls;
+
+ rh->namestore_qe = NULL;
+ if (NULL != emsg)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to cache GNS resolution: %s\n"),
+ emsg);
+}
+
+
+/**
+ * Iterator called on each result obtained for a DHT
+ * operation that expects a reply
+ *
+ * @param cls closure with the 'struct GNS_ResolverHandle'
+ * @param exp when will this value expire
+ * @param key key of the result
+ * @param get_path peers on reply path (or NULL if not recorded)
+ * [0] = datastore's first neighbor, [length - 1] = local peer
+ * @param get_path_length number of entries in get_path
+ * @param put_path peers on the PUT path (or NULL if not recorded)
+ * [0] = origin, [length - 1] = datastore
+ * @param put_path_length number of entries in get_path
+ * @param type type of the result
+ * @param size number of bytes in data
+ * @param data pointer to the result data
+ */
+static void
+handle_dht_response (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 GNS_ResolverHandle *rh = cls;
+ struct AuthorityChain *ac = rh->ac_tail;
+ const struct GNUNET_NAMESTORE_Block *block;
- /* no answers that would cause delegation were found */
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "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.
- */
- if (0 == strcmp (rh->name, ""))
+ GNUNET_DHT_get_stop (rh->get_handle);
+ rh->get_handle = NULL;
+ GNUNET_CONTAINER_heap_remove_node (rh->dht_heap_node);
+ rh->dht_heap_node = NULL;
+ if (size < sizeof (struct GNUNET_NAMESTORE_Block))
+ {
+ /* how did this pass DHT block validation!? */
+ GNUNET_break (0);
+ rh->proc (rh->proc_cls, 0, NULL);
+ GNS_resolver_lookup_cancel (rh);
+ return;
+ }
+ block = data;
+ if (size !=
+ ntohs (block->purpose.size) +
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey) +
+ sizeof (struct GNUNET_CRYPTO_EccSignature))
{
- /* Start shortening */
- if ((rh->priv_key != NULL) &&
- (is_canonical (rh->name) == GNUNET_YES))
+ /* how did this pass DHT block validation!? */
+ GNUNET_break (0);
+ rh->proc (rh->proc_cls, 0, NULL);
+ GNS_resolver_lookup_cancel (rh);
+ return;
+ }
+ if (GNUNET_OK !=
+ GNUNET_NAMESTORE_block_decrypt (block,
+ &ac->authority_info.gns_authority,
+ ac->label,
+ &handle_gns_resolution_result,
+ rh))
+ {
+ GNUNET_break_op (0); /* block was ill-formed */
+ rh->proc (rh->proc_cls, 0, NULL);
+ GNS_resolver_lookup_cancel (rh);
+ return;
+ }
+ /* Cache well-formed blocks */
+ rh->namestore_qe = GNUNET_NAMESTORE_block_cache (namestore_handle,
+ block,
+ &namestore_cache_continuation,
+ rh);
+}
+
+
+/**
+ * Process a record that was stored in the namestore.
+ *
+ * @param cls closure with the 'struct GNS_ResolverHandle'
+ * @param block block that was stored in the namestore
+ */
+static void
+handle_namestore_block_response (void *cls,
+ const struct GNUNET_NAMESTORE_Block *block)
+{
+ struct GNS_ResolverHandle *rh = cls;
+ struct GNS_ResolverHandle *rx;
+ struct AuthorityChain *ac = rh->ac_tail;
+ const char *label = ac->label;
+ const struct GNUNET_CRYPTO_EccPublicKey *auth = &ac->authority_info.gns_authority;
+ struct GNUNET_HashCode query;
+
+ GNUNET_NAMESTORE_query_from_public_key (auth,
+ label,
+ &query);
+ rh->namestore_qe = NULL;
+ if (NULL == block)
+ {
+ /* Namestore knows nothing; try DHT lookup */
+ rh->get_handle = GNUNET_DHT_get_start (dht_handle,
+ GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
+ &query,
+ DHT_GNS_REPLICATION_LEVEL,
+ GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
+ NULL, 0,
+ &handle_dht_response, rh);
+ rh->dht_heap_node = GNUNET_CONTAINER_heap_insert (dht_lookup_heap,
+ rh,
+ GNUNET_TIME_absolute_get ().abs_value_us);
+ if (GNUNET_CONTAINER_heap_get_size (dht_lookup_heap) > max_allowed_background_queries)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Trying to shorten authority chain\n",
- rh->id);
- start_shorten (rh->authority_chain_head,
- rh->priv_key);
+ /* fail longest-standing DHT request */
+ rx = GNUNET_CONTAINER_heap_peek (dht_lookup_heap);
+ rx->proc (rx->proc_cls, 0, NULL);
+ GNS_resolver_lookup_cancel (rx);
}
- /* 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);
+ return;
}
- else
- {
- 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);
+ if (GNUNET_OK !=
+ GNUNET_NAMESTORE_block_decrypt (block,
+ auth,
+ label,
+ &handle_gns_resolution_result,
+ rh))
+ {
+ GNUNET_break_op (0); /* block was ill-formed */
+ rh->proc (rh->proc_cls, 0, NULL);
+ GNS_resolver_lookup_cancel (rh);
+ return;
}
}
/**
- * Resolve the delegation chain for the request in our namestore
- * (as in, find the respective authority for the leftmost label).
+ * Lookup tail of our authority chain in the namestore.
*
- * @param rh the resolver handle
+ * @param rh query we are processing
*/
static void
-resolve_delegation_ns (struct ResolverHandle *rh)
+recursive_gns_resolution_namestore (struct GNS_ResolverHandle *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);
+ struct AuthorityChain *ac = rh->ac_tail;
+ struct GNUNET_HashCode query;
+
+ GNUNET_NAMESTORE_query_from_public_key (&ac->authority_info.gns_authority,
+ ac->label,
+ &query);
+ rh->namestore_qe = GNUNET_NAMESTORE_lookup_block (namestore_handle,
+ &query,
+ &handle_namestore_block_response,
+ rh);
}
-#endif
+/**
+ * Task scheduled to continue with the resolution process.
+ *
+ * @param cls the 'struct GNS_ResolverHandle' of the resolution
+ * @param tc task context
+ */
+static void
+recursive_resolution (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNS_ResolverHandle *rh = cls;
+
+ rh->task_id = GNUNET_SCHEDULER_NO_TASK;
+ if (MAX_RECURSION < rh->loop_limiter++)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Encountered unbounded recursion resolving `%s'\n",
+ rh->name);
+ rh->proc (rh->proc_cls, 0, NULL);
+ GNS_resolver_lookup_cancel (rh);
+ return;
+ }
+ if (GNUNET_YES == rh->ac_tail->gns_authority)
+ recursive_gns_resolution_namestore (rh);
+ else
+ recursive_dns_resolution (rh);
+}
/**
int only_cached,
GNS_ResultProcessor proc, void *proc_cls)
{
- return NULL;
-#if 0
- struct ResolverHandle *rh;
- struct RecordLookupHandle* rlh;
- 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) with timeout %s!\n",
- name, record_type,
- GNUNET_STRINGS_relative_time_to_string (timeout, GNUNET_YES));
-
- 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);
- proc(cls, 0, NULL);
- return;
- }
-
- rlh = GNUNET_malloc (sizeof(struct RecordLookupHandle));
- rh = GNUNET_malloc (sizeof (struct ResolverHandle));
- rh->authority = zone;
- rh->id = rid_gen++;
- rh->proc_cls = rlh;
- rh->priv_key = key;
- rh->timeout = timeout;
- rh->private_local_zone = pzone;
+ struct GNS_ResolverHandle *rh;
+ struct AuthorityChain *ac;
+ char *x;
+ char *y;
+ char *pkey;
+
+ rh = GNUNET_new (struct GNS_ResolverHandle);
+ GNUNET_CONTAINER_DLL_insert (rlh_head,
+ rlh_tail,
+ rh);
+ rh->authority_zone = *zone;
+ rh->proc = proc;
+ rh->proc_cls = proc_cls;
rh->only_cached = only_cached;
-
- 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_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 %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);
- rh->timeout_cont = &dht_authority_lookup_timeout;
- rh->timeout_cont_cls = rh;
- }
- else
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "No timeout for query!\n");
- rh->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- }
-
- if (strcmp(GNUNET_GNS_TLD, name) == 0)
+ rh->record_type = record_type;
+ rh->name = GNUNET_strdup (name);
+ rh->name_resolution_pos = strlen (name);
+ if (NULL != shorten_key)
{
- /**
- * Only '.gads' given
- */
- strcpy (rh->name, "\0");
+ rh->shorten_key = GNUNET_new (struct GNUNET_CRYPTO_EccPrivateKey);
+ *rh->shorten_key = *shorten_key;
}
- else
- {
- 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
- */
- 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,
- &rh->authority))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "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);
- proc (cls, 0, NULL);
- return;
- }
+ if ( ( (GNUNET_YES == is_canonical (name)) &&
+ (0 != strcmp (GNUNET_GNS_TLD, name)) ) ||
+ ( (GNUNET_YES != is_gnu_tld (name)) &&
+ (GNUNET_YES != is_zkey_tld (name)) ) )
+ {
+ /* use standard DNS lookup */
+ int af;
- }
- else if (is_gads_tld (name) == GNUNET_YES)
+ switch (record_type)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "TLD is gads\n");
- /**
- * Presumably GADS tld
- */
- memcpy (rh->name, name,
- strlen (name) - strlen(GNUNET_GNS_TLD) - 1);
- rh->name[strlen (name) - strlen(GNUNET_GNS_TLD) - 1] = '\0';
+ case GNUNET_DNSPARSER_TYPE_A:
+ af = AF_INET;
+ break;
+ case GNUNET_DNSPARSER_TYPE_AAAA:
+ af = AF_INET6;
+ break;
+ default:
+ af = AF_UNSPEC;
+ break;
}
- else
+ rh->std_resolve = GNUNET_RESOLVER_ip_get (name,
+ af,
+ DNS_LOOKUP_TIMEOUT,
+ &handle_dns_result,
+ rh);
+ return rh;
+ }
+ if (is_zkey_tld (name))
+ {
+ /* Name ends with ".zkey", try to replace authority zone with zkey
+ authority */
+ GNUNET_free (resolver_lookup_get_next_label (rh)); /* will return "zkey" */
+ x = resolver_lookup_get_next_label (rh); /* will return 'x' coordinate */
+ y = resolver_lookup_get_next_label (rh); /* will return 'y' coordinate */
+ GNUNET_asprintf (&pkey,
+ "%s%s",
+ x, y);
+ if ( (NULL == x) ||
+ (NULL == y) ||
+ (GNUNET_OK !=
+ GNUNET_CRYPTO_ecc_public_key_from_string (pkey,
+ strlen (pkey),
+ &rh->authority_zone)) )
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("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);
- GNUNET_free (rh);
- GNUNET_free (rlh);
- proc (cls, 0, NULL);
- return;
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Hostname `%s' is not well-formed, resolution fails\n"),
+ name);
+ rh->task_id = GNUNET_SCHEDULER_add_now (&fail_resolution, rh);
}
+ GNUNET_free_non_null (x);
+ GNUNET_free_non_null (y);
+ GNUNET_free (pkey);
}
-
- /**
- * Initialize authority chain
- */
- 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, "");
-
- /**
- * Copy original query into lookup handle
- */
- rlh->record_type = record_type;
- memset(rlh->name, 0, strlen(name) + 1);
- strcpy(rlh->name, name);
- rlh->proc = proc;
- rlh->proc_cls = cls;
-
- rh->proc = &handle_delegation_ns;
- resolve_delegation_ns (rh);
-#endif
+ else
+ {
+ /* Name ends with ".gnu", eat ".gnu" and continue with resolution */
+ GNUNET_free (resolver_lookup_get_next_label (rh));
+ }
+ ac = GNUNET_new (struct AuthorityChain);
+ ac->rh = rh;
+ ac->label = resolver_lookup_get_next_label (rh);
+ if (NULL == ac->label)
+ /* name was just "gnu", so we default to label '+' */
+ ac->label = GNUNET_strdup (GNUNET_GNS_MASTERZONE_STR);
+ ac->gns_authority = GNUNET_YES;
+ ac->authority_info.gns_authority = rh->authority_zone;
+ GNUNET_CONTAINER_DLL_insert_tail (rh->ac_head,
+ rh->ac_tail,
+ ac);
+ rh->task_id = GNUNET_SCHEDULER_add_now (&recursive_resolution,
+ rh);
+ return rh;
}
-
/**
* Cancel active resolution (i.e. client disconnected).
*
- * @param h resolution to abort
+ * @param rh resolution to abort
*/
void
-GNS_resolver_lookup_cancel (struct GNS_ResolverHandle *h)
+GNS_resolver_lookup_cancel (struct GNS_ResolverHandle *rh)
{
+ struct DnsResult *dr;
+ struct AuthorityChain *ac;
+
+ GNUNET_CONTAINER_DLL_remove (rlh_head,
+ rlh_tail,
+ rh);
+ while (NULL != (ac = rh->ac_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (rh->ac_head,
+ rh->ac_tail,
+ ac);
+ GNUNET_free (ac->label);
+ GNUNET_free (ac);
+ }
+ if (GNUNET_SCHEDULER_NO_TASK != rh->task_id)
+ {
+ GNUNET_SCHEDULER_cancel (rh->task_id);
+ rh->task_id = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (NULL != rh->get_handle)
+ {
+ GNUNET_DHT_get_stop (rh->get_handle);
+ rh->get_handle = NULL;
+ }
+ if (NULL != rh->dht_heap_node)
+ {
+ GNUNET_CONTAINER_heap_remove_node (rh->dht_heap_node);
+ rh->dht_heap_node = NULL;
+ }
+ if (NULL != rh->dns_request)
+ {
+ GNUNET_DNSSTUB_resolve_cancel (rh->dns_request);
+ rh->dns_request = NULL;
+ }
+ if (NULL != rh->namestore_qe)
+ {
+ GNUNET_NAMESTORE_cancel (rh->namestore_qe);
+ rh->namestore_qe = NULL;
+ }
+ if (NULL != rh->std_resolve)
+ {
+ GNUNET_RESOLVER_request_cancel (rh->std_resolve);
+ rh->std_resolve = NULL;
+ }
+ while (NULL != (dr = rh->dns_result_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (rh->dns_result_head,
+ rh->dns_result_tail,
+ dr);
+ GNUNET_free (dr);
+ }
+ GNUNET_free_non_null (rh->shorten_key);
+ GNUNET_free (rh->name);
+ GNUNET_free (rh);
}
* Initialize the resolver
*
* @param nh the namestore handle
- * @param dh the dht handle
+ * @param dht 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
GNS_resolver_init (struct GNUNET_NAMESTORE_Handle *nh,
- struct GNUNET_DHT_Handle *dh,
+ struct GNUNET_DHT_Handle *dht,
const struct GNUNET_CONFIGURATION_Handle *c,
unsigned long long max_bg_queries)
{
cfg = c;
namestore_handle = nh;
- dht_handle = dh;
+ dht_handle = dht;
dht_lookup_heap =
GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
max_allowed_background_queries = max_bg_queries;
void
GNS_resolver_done ()
{
+ struct GNS_ResolverHandle *rh;
+
+ /* abort active resolutions */
+ while (NULL != (rh = rlh_head))
+ {
+ rh->proc (rh->proc_cls, 0, NULL);
+ GNS_resolver_lookup_cancel (rh);
+ }
+ /* abort active shorten operations */
while (NULL != gph_head)
free_get_pseu_authority_handle (gph_head);
GNUNET_CONTAINER_heap_destroy (dht_lookup_heap);
}
-
-
/* end of gnunet-service-gns_resolver.c */