* @author Martin Schanzenbach
*/
#include "platform.h"
-#include <unicase.h>
#include "gnunet_util_lib.h"
#include "gnunet_transport_service.h"
#include "gnunet_dns_service.h"
#include "gns.h"
#include "gnunet-service-gns_resolver.h"
-#define DHT_OPERATION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3)
#define DHT_LOOKUP_TIMEOUT DHT_OPERATION_TIMEOUT
#define DHT_GNS_REPLICATION_LEVEL 5
#define MAX_DNS_LABEL_LENGTH 63
*/
static unsigned long long max_allowed_background_queries;
+/**
+ * Wheather or not to ignore pending records
+ */
+static int ignore_pending_records;
+
/**
* Our local zone
*/
static struct GNUNET_CRYPTO_ShortHashCode local_zone;
+/**
+ * a resolution identifier pool variable
+ * FIXME overflow?
+ * This is a non critical identifier useful for debugging
+ */
+static unsigned long long rid = 0;
+
/**
* Namestore calls this function if we have record for this name.
* (or with rd_count=0 to indicate no matches)
GNUNET_NAMESTORE_lookup_record(namestore_handle,
&gph->zone,
gph->new_name,
- GNUNET_GNS_RECORD_PSEU,
+ GNUNET_NAMESTORE_TYPE_ANY,
&process_pseu_lookup_ns,
gph);
return;
new_pkey.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
new_pkey.data = &gph->new_zone;
new_pkey.record_type = GNUNET_GNS_RECORD_PKEY;
+ new_pkey.flags = GNUNET_NAMESTORE_RF_AUTHORITY
+ | GNUNET_NAMESTORE_RF_PRIVATE
+ | GNUNET_NAMESTORE_RF_PENDING;
GNUNET_NAMESTORE_record_create (namestore_handle,
gph->key,
gph->new_name,
GNUNET_NAMESTORE_lookup_record(namestore_handle,
&gph->zone,
gph->new_name,
- GNUNET_GNS_RECORD_PSEU,
+ GNUNET_NAMESTORE_TYPE_ANY,
&process_pseu_lookup_ns,
gph);
}
process_pseu_result(gph, NULL);
}
-/**
- * Callback called by namestore for a zone to name
- * result
- *
- * @param cls the closure
- * @param zone_key the zone we queried
- * @param expire the expiration time of the name
- * @param name the name found or NULL
- * @param rd_len number of records for the name
- * @param rd the record data (PKEY) for the name
- * @param signature the signature for the record data
- */
static void
-process_zone_to_name_discover(void *cls,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
- struct GNUNET_TIME_Absolute expire,
- const char *name,
- unsigned int rd_len,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_RsaSignature *signature)
+process_auth_discovery_ns_result(void* cls,
+ const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *key,
+ struct GNUNET_TIME_Absolute expiration,
+ const char *name, unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd,
+ const struct GNUNET_CRYPTO_RsaSignature *signature)
{
+ uint32_t xquery;
+ struct GNUNET_CRYPTO_ShortHashCode name_hash;
+ GNUNET_HashCode lookup_key;
+ struct GNUNET_CRYPTO_HashAsciiEncoded lookup_key_string;
+ GNUNET_HashCode name_hash_double;
+ GNUNET_HashCode zone_hash_double;
+ int i;
struct GetPseuAuthorityHandle* gph = (struct GetPseuAuthorityHandle*)cls;
-
- /* we found a match in our own zone */
- if (rd_len != 0)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_AUTO_PSEU: name for zone in our root %d\n", strlen(name));
- GNUNET_free(gph);
- }
- else
+
+ /* no pseu found */
+ if (rd_count == 0)
{
/**
- * No name found.
* check dht
*/
- uint32_t xquery;
- struct GNUNET_CRYPTO_ShortHashCode name_hash;
- GNUNET_HashCode lookup_key;
- struct GNUNET_CRYPTO_HashAsciiEncoded lookup_key_string;
- GNUNET_HashCode name_hash_double;
- GNUNET_HashCode zone_hash_double;
-
GNUNET_CRYPTO_short_hash("+", strlen("+"), &name_hash);
GNUNET_CRYPTO_short_hash_double (&name_hash, &name_hash_double);
GNUNET_CRYPTO_short_hash_double (&gph->new_zone, &zone_hash_double);
sizeof(xquery),
&process_auth_discovery_dht_result,
gph);
+ return;
+ }
+ for (i=0; i<rd_count; i++)
+ {
+ if ((strcmp(name, "+") == 0) &&
+ (rd[i].record_type == GNUNET_GNS_RECORD_PSEU))
+ {
+ /* found pseu */
+ process_pseu_result(gph, (char*)rd[i].data);
+ return;
+ }
+ }
+}
+
+/**
+ * Callback called by namestore for a zone to name
+ * result
+ *
+ * @param cls the closure
+ * @param zone_key the zone we queried
+ * @param expire the expiration time of the name
+ * @param name the name found or NULL
+ * @param rd_len number of records for the name
+ * @param rd the record data (PKEY) for the name
+ * @param signature the signature for the record data
+ */
+static void
+process_zone_to_name_discover(void *cls,
+ const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
+ struct GNUNET_TIME_Absolute expire,
+ const char *name,
+ unsigned int rd_len,
+ const struct GNUNET_NAMESTORE_RecordData *rd,
+ const struct GNUNET_CRYPTO_RsaSignature *signature)
+{
+ struct GetPseuAuthorityHandle* gph = (struct GetPseuAuthorityHandle*)cls;
+ /* we found a match in our own zone */
+ if (rd_len != 0)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_AUTO_PSEU: name for zone in our root %s\n", name);
+ GNUNET_free(gph);
}
+ else
+ {
+
+ GNUNET_NAMESTORE_lookup_record(namestore_handle,
+ &gph->new_zone,
+ "+",
+ GNUNET_GNS_RECORD_PSEU,
+ &process_auth_discovery_ns_result,
+ gph);
+ }
+
+
}
* @param dh the dht handle
* @param lz the local zone's hash
* @param max_bg_queries maximum number of parallel background queries in dht
+ * @param ignore_pending ignore records that still require user confirmation
+ * on lookup
* @return GNUNET_OK on success
*/
int
gns_resolver_init(struct GNUNET_NAMESTORE_Handle *nh,
struct GNUNET_DHT_Handle *dh,
struct GNUNET_CRYPTO_ShortHashCode lz,
- unsigned long long max_bg_queries)
+ unsigned long long max_bg_queries,
+ int ignore_pending)
{
namestore_handle = nh;
dht_handle = dh;
dht_lookup_heap =
GNUNET_CONTAINER_heap_create(GNUNET_CONTAINER_HEAP_ORDER_MIN);
max_allowed_background_queries = max_bg_queries;
+ ignore_pending_records = ignore_pending;
if ((namestore_handle != NULL) && (dht_handle != NULL))
{
ResolverCleanupContinuation cont = cls;
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_CLEANUP: Terminating background lookup for %s\n",
- rh->name);
+ "GNS_CLEANUP-%llu: Terminating background lookup for %s\n",
+ rh->id, rh->name);
GNUNET_DHT_get_stop(rh->get_handle);
rh->get_handle = NULL;
rh->proc(rh->proc_cls, rh, 0, NULL);
{
//We could do sth verbose/more useful here but it doesn't make any difference
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_BG: background dht lookup for finished.\n");
+ "GNS_BG: background dht lookup for finished. (%d results)\n",
+ rd_count);
}
/**
char new_name[MAX_DNS_NAME_LENGTH];
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC: dht lookup for query %s timed out.\n",
- rh->name);
+ "GNS_PHASE_REC-%d: dht lookup for query %s (%ds)timed out.\n",
+ rh->id, rh->name, rh->timeout.rel_value);
/**
* Start resolution in bg
*/
rh->name, GNUNET_GNS_TLD);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC: Starting background lookup for %s type %d\n",
- new_name, rlh->record_type);
+ "GNS_PHASE_REC-%d: Starting background lookup for %s type %d\n",
+ rh->id, new_name, rlh->record_type);
gns_resolver_lookup_record(rh->authority,
rlh->record_type,
char* rd_data = (char*)data;
int i;
int rd_size;
-
+
+ rh = (struct ResolverHandle *)cls;
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC: got dht result (size=%d)\n", size);
+ "GNS_PHASE_REC-%d: got dht result (size=%d)\n", rh->id, size);
if (data == NULL)
return;
//FIXME maybe check expiration here, check block type
- rh = (struct ResolverHandle *)cls;
+
rlh = (struct RecordLookupHandle *) rh->proc_cls;
nrb = (struct GNSNameRecordBlock*)data;
num_records,
rd))
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Error deserializing data!\n");
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ "GNS_PHASE_REC-%d: Error deserializing data!\n", rh->id);
return;
}
for (i=0; i<num_records; i++)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC: Got name: %s (wanted %s)\n", name, rh->name);
+ "GNS_PHASE_REC-%d: Got name: %s (wanted %s)\n",
+ rh->id, name, rh->name);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC: Got type: %d\n",
- rd[i].record_type);
+ "GNS_PHASE_REC-%d: Got type: %d\n",
+ rh->id, rd[i].record_type);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC: Got data length: %d\n", rd[i].data_size);
+ "GNS_PHASE_REC-%d: Got data length: %d\n",
+ rh->id, rd[i].data_size);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC: Got flag %d\n", rd[i].flags);
+ "GNS_PHASE_REC-%d: Got flag %d\n",
+ rh->id, rd[i].flags);
if ((strcmp(name, rh->name) == 0) &&
(rd[i].record_type == rlh->record_type))
GNUNET_CRYPTO_hash_to_enc (&lookup_key, &lookup_key_string);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC: starting dht lookup for %s with key: %s\n",
- rh->name, (char*)&lookup_key_string);
+ "GNS_PHASE_REC-%d: starting dht lookup for %s with key: %s\n",
+ rh->id, rh->name, (char*)&lookup_key_string);
//rh->timeout_task = GNUNET_SCHEDULER_NO_TASK;
rh->dht_heap_node = NULL;
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC: Adjusting timeout\n");
+ "GNS_PHASE_REC-%d: Adjusting timeout\n", rh->id);
/*
* Set timeout for authority lookup phase to 1/2
*/
rh_heap_root->dht_heap_node = NULL;
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC: Replacing oldest background query for %s\n",
- rh_heap_root->name);
+ "GNS_PHASE_REC-%d: 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,
if (name != NULL)
{
- rh->status |= EXISTS;
+ rh->status |= RSL_RECORD_EXISTS;
}
if (remaining_time.rel_value == 0)
{
- rh->status |= EXPIRED;
+ rh->status |= RSL_RECORD_EXPIRED;
}
if (rd_count == 0)
* Lookup terminated and no results
*/
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC: Namestore lookup for %s terminated without results\n",
- name);
+ "GNS_PHASE_REC-%d: Namestore lookup for %s terminated without results\n",
+ rh->id, name);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC: Record %s unknown in namestore\n",
- rh->name);
+ "GNS_PHASE_REC-%d: Record %s unknown in namestore\n",
+ rh->id, rh->name);
/**
* Our zone and no result? Cannot resolve TT
*/
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC: Processing additional result %s from namestore\n",
- name);
+ "GNS_PHASE_REC-%d: Processing additional result %s from namestore\n",
+ rh->id, name);
int i;
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-%d: Record %s is awaiting user confirmation. Skipping\n",
+ rh->id, name);
+ continue;
+ }
if ((GNUNET_TIME_absolute_get_remaining (rd[i].expiration)).rel_value
== 0)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC: This record is expired. Skipping\n");
+ "GNS_PHASE_REC-%d: This record is expired. Skipping\n",
+ rh->id);
continue;
}
if (rh->answered == 0)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC: No answers found. This is odd!\n");
+ "GNS_PHASE_REC-%d: 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: Found %d answer(s) to query in %d records!\n",
- rh->answered, rd_count);
+ "GNS_PHASE_REC-%d: 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);
}
char new_name[MAX_DNS_NAME_LENGTH];
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: dht lookup for query %s timed out.\n",
- rh->authority_name);
+ "GNS_PHASE_DELEGATE_DHT-%llu: dht lookup for query %s (%ds)timed out.\n",
+ rh->id, rh->authority_name, rh->timeout.rel_value);
- rh->status |= TIMED_OUT;
+ rh->status |= RSL_TIMED_OUT;
rh->timeout_task = GNUNET_SCHEDULER_NO_TASK;
* Start resolution in bg
*/
GNUNET_snprintf(new_name, MAX_DNS_NAME_LENGTH,
- "%s.%s", rh->name, GNUNET_GNS_TLD);
+ "%s.%s.%s", rh->name, rh->authority_name, GNUNET_GNS_TLD);
//strcpy(new_name, rh->name);
//strcpy(new_name+strlen(new_name), ".");
//memcpy(new_name+strlen(new_name), GNUNET_GNS_TLD, strlen(GNUNET_GNS_TLD));
+ strcpy(rh->name, new_name);
+
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: Starting background query for %s type %d\n",
- new_name, rlh->record_type);
+ "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,
rlh->record_type,
/* Prototype */
static void resolve_delegation_ns(struct ResolverHandle *rh);
+
+/**
+ * Namestore resolution for delegation finished. Processing result.
+ *
+ * @param cls the closure
+ * @param rh resolver handle
+ * @param rd_count number of results (always 0)
+ * @param rd record data (always NULL)
+ */
+static void
+handle_delegation_ns(void* cls, struct ResolverHandle *rh,
+ unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd);
+
+
/**
* Function called when we get a result from the dht
* for our query. Recursively tries to resolve authorities
int rd_size;
struct GNUNET_CRYPTO_ShortHashCode zone, name_hash;
GNUNET_HashCode zone_hash_double, name_hash_double;
+
+ rh = (struct ResolverHandle *)cls;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "GNS_PHASE_DELEGATE: Got DHT result\n");
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_DHT-%llu: Got DHT result\n", rh->id);
if (data == NULL)
return;
- //FIXME check expiration?
-
- rh = (struct ResolverHandle *)cls;
nrb = (struct GNSNameRecordBlock*)data;
/* stop dht lookup and timeout task */
rd))
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "GNS_PHASE_DELEGATE: Error deserializing data!\n");
+ "GNS_PHASE_DELEGATE_DHT-%llu: Error deserializing data!\n",
+ rh->id);
return;
}
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: Got name: %s (wanted %s)\n",
- name, rh->authority_name);
+ "GNS_PHASE_DELEGATE_DHT-%llu: Got name: %s (wanted %s)\n",
+ rh->id, name, rh->authority_name);
for (i=0; i<num_records; i++)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: Got name: %s (wanted %s)\n",
- name, rh->authority_name);
+ "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: Got type: %d (wanted %d)\n",
- rd[i].record_type, GNUNET_GNS_RECORD_PKEY);
+ "GNS_PHASE_DELEGATE_DHT-%llu: Got type: %d (wanted %d)\n",
+ rh->id, rd[i].record_type, GNUNET_GNS_RECORD_PKEY);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: Got data length: %d\n",
- rd[i].data_size);
+ "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: Got flag %d\n", rd[i].flags);
+ "GNS_PHASE_DELEGATE_DHT-%llu: Got flag %d\n",
+ rh->id, rd[i].flags);
if ((strcmp(name, rh->authority_name) == 0) &&
(rd[i].record_type == GNUNET_GNS_RECORD_PKEY))
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: Authority found in DHT\n");
+ "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 =
* FIXME in this case. should we ask namestore again?
*/
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: Answer from DHT for %s to resolve: %s\n",
- rh->authority_name, rh->name);
+ "GNS_PHASE_DELEGATE_DHT-%llu: Answer from DHT for %s. Yet to resolve: %s\n",
+ rh->id, rh->authority_name, rh->name);
if (strcmp(rh->name, "") == 0)
+ {
rh->proc(rh->proc_cls, rh, 0, NULL);
+ }
else
+ {
+ rh->proc = &handle_delegation_ns;
resolve_delegation_ns(rh);
+ }
return;
}
* promote back
*/
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: Adding %s back to %s\n",
- rh->authority_name, rh->name);
+ "GNS_PHASE_DELEGATE_DHT-%llu: Adding %s back to %s\n",
+ rh->id, rh->authority_name, rh->name);
if (strcmp(rh->name, "") == 0)
strcpy(rh->name, rh->authority_name);
else
rh->name, rh->authority_name); //FIXME ret
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: %s restored\n", rh->name);
+ "GNS_PHASE_DELEGATE_DHT-%llu: %s restored\n", rh->id, rh->name);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: DHT authority lookup found no match!\n");
+ "GNS_PHASE_DELEGATE_DHT-%llu: DHT authority lookup found no match!\n",
+ rh->id);
rh->proc(rh->proc_cls, rh, 0, NULL);
}
if (rd_count == 0)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC: No records for %s found in DHT. Aborting\n",
- rh->name);
+ "GNS_PHASE_REC-%d: No records for %s found in DHT. Aborting\n",
+ rh->id, rh->name);
/* give up, cannot resolve */
finish_lookup(rh, rlh, 0, NULL);
free_resolver_handle(rh);
/* results found yay */
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC: Record resolved from DHT!");
+ "GNS_PHASE_REC-%d: Record resolved from DHT!", rh->id);
finish_lookup(rh, rlh, rd_count, rd);
free_resolver_handle(rh);
if (rd_count == 0)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC: Resolution status: %d!\n", rh->status);
+ "GNS_PHASE_REC-%d: NS returned no records. (status: %d)!\n",
+ rh->id,
+ rh->status);
- /* ns entry expired and not ours. try dht */
- if (rh->status & (EXPIRED | !EXISTS) &&
+ /**
+ * There are 4 conditions that have to met for us to consult the DHT:
+ * 1. The entry in the DHT is RSL_RECORD_EXPIRED AND
+ * 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)
+ */
+ if (rh->status & (RSL_RECORD_EXPIRED | !RSL_RECORD_EXISTS) &&
GNUNET_CRYPTO_short_hash_cmp(&rh->authority_chain_head->zone,
- &local_zone))
+ &local_zone) &&
+ (strcmp(rh->name, "+") == 0))
{
rh->proc = &handle_record_dht;
resolve_record_dht(rh);
/* results found yay */
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC: Record resolved from namestore!");
+ "GNS_PHASE_REC-%d: Record resolved from namestore!", rh->id);
finish_lookup(rh, rlh, rd_count, rd);
offset = strlen(name)-strlen(tld);
if (strcmp(name+offset, tld) != 0)
{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"%s is not in .%s TLD\n", name, tld);
return GNUNET_NO;
}
if ((rlh->record_type == GNUNET_GNS_RECORD_PKEY))
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: Resolved queried PKEY via DHT.\n");
+ "GNS_PHASE_DELEGATE_DHT-%llu: Resolved queried PKEY via DHT.\n",
+ rh->id);
finish_lookup(rh, rlh, rd_count, rd);
free_resolver_handle(rh);
return;
}
/* We resolved full name for delegation. resolving record */
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: Resolved full name for delegation via DHT.\n");
+ "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);
if (is_canonical(rh->name))
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: Resolving canonical record %s in ns\n",
- rh->name);
+ "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: Cannot fully resolve delegation for %s via DHT!\n",
- rh->name);
+ "GNS_PHASE_DELEGATE_DHT-%llu: Cannot fully resolve delegation for %s via DHT!\n",
+ rh->id, rh->name);
finish_lookup(rh, rlh, 0, NULL);
free_resolver_handle(rh);
}
rh_heap_root->dht_heap_node = NULL;
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: Replacing oldest background query for %s\n",
- rh_heap_root->authority_name);
+ "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,
{
struct RecordLookupHandle* rlh;
rlh = (struct RecordLookupHandle*) cls;
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: Resolution status: %d.\n",
+ rh->id, rh->status);
if (strcmp(rh->name, "") == 0)
{
{
GNUNET_assert(rd_count == 1);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: Resolved queried PKEY in NS.\n");
+ "GNS_PHASE_DELEGATE_NS-%llu: Resolved queried PKEY in NS.\n",
+ rh->id);
finish_lookup(rh, rlh, rd_count, rd);
free_resolver_handle(rh);
return;
}
/* We resolved full name for delegation. resolving record */
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: Resolved full name for delegation.\n");
+ "GNS_PHASE_DELEGATE_NS-%llu: Resolved full name for delegation.\n",
+ rh->id);
strcpy(rh->name, "+\0");
rh->proc = &handle_record_ns;
resolve_record_ns(rh);
* and exists
* or we are authority
**/
- if ((rh->status & (EXISTS | !EXPIRED)) ||
- !GNUNET_CRYPTO_short_hash_cmp(&rh->authority_chain_head->zone,
- &rh->authority_chain_tail->zone))
+ if (((rh->status & RSL_RECORD_EXISTS) && (!(rh->status & RSL_RECORD_EXPIRED)))
+ || !GNUNET_CRYPTO_short_hash_cmp(&rh->authority_chain_head->zone,
+ &local_zone))
{
if (is_canonical(rh->name))
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: Resolving canonical record %s\n",
+ "GNS_PHASE_DELEGATE_NS-%llu: Resolving canonical record %s\n",
+ rh->id,
rh->name);
rh->proc = &handle_record_ns;
resolve_record_ns(rh);
{
/* give up, cannot resolve */
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: Cannot fully resolve delegation for %s!\n",
- rh->name);
- rlh->proc(rlh->proc_cls, 0, NULL);
+ "GNS_PHASE_DELEGATE_NS-%llu: Cannot fully resolve delegation for %s!\n",
+ rh->id,
+ rh->name);
+ finish_lookup(rh, rlh, rd_count, rd);
+ //rlh->proc(rlh->proc_cls, 0, NULL);
}
return;
}
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: Trying to resolve delegation for %s via DHT\n",
- rh->name);
+ "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);
}
struct GNUNET_TIME_Relative remaining_time;
struct GNUNET_CRYPTO_ShortHashCode zone;
char new_name[MAX_DNS_NAME_LENGTH];
-
+
+ rh = (struct ResolverHandle *)cls;
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: Got %d records from authority lookup\n",
- rd_count);
+ "GNS_PHASE_DELEGATE_NS-%llu: Got %d records from authority lookup\n",
+ rh->id, rd_count);
- rh = (struct ResolverHandle *)cls;
GNUNET_CRYPTO_short_hash(key,
sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
&zone);
if (name != NULL)
{
- rh->status |= EXISTS;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: Records with name %s exist.\n",
+ rh->id, name);
+ rh->status |= RSL_RECORD_EXISTS;
}
if (remaining_time.rel_value == 0)
{
- rh->status |= EXPIRED;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: Record set %s expired.\n",
+ rh->id, name);
+ rh->status |= RSL_RECORD_EXPIRED;
}
/**
{
/* simply promote back */
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: Promoting %s back to name\n",
- rh->authority_name);
+ "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: Adding %s back to %s\n",
- rh->authority_name, rh->name);
+ "GNS_PHASE_DELEGATE_NS-%llu: Adding %s back to %s\n",
+ rh->id, rh->authority_name, rh->name);
//memset(new_name, 0, strlen(rh->name) + strlen(rh->authority_name) + 2);
- strcpy(new_name, rh->name);
- strcpy(new_name+strlen(new_name), ".");
- strcpy(new_name+strlen(new_name), rh->authority_name);
+ GNUNET_snprintf(new_name, MAX_DNS_NAME_LENGTH, "%s.%s",
+ rh->name, rh->authority_name);
+ //strcpy(new_name, rh->name);
+ //strcpy(new_name+strlen(new_name), ".");
+ //strcpy(new_name+strlen(new_name), rh->authority_name);
strcpy(rh->name, new_name);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: %s restored\n", rh->name);
+ "GNS_PHASE_DELEGATE_NS-%llu: %s restored\n", rh->id, rh->name);
}
rh->proc(rh->proc_cls, rh, 0, NULL);
return;
if (rd[i].record_type != GNUNET_GNS_RECORD_PKEY)
continue;
+
+ if (ignore_pending_records &&
+ (rd[i].flags & GNUNET_NAMESTORE_RF_PENDING))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: PKEY for %s is pending user confirmation.\n",
+ name,
+ rh->id);
+ continue;
+ }
if ((GNUNET_TIME_absolute_get_remaining (rd[i].expiration)).rel_value
== 0)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: This pkey is expired.\n");
+ "GNS_PHASE_DELEGATE_NS-%llu: This pkey is expired.\n",
+ rh->id);
if (remaining_time.rel_value == 0)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: This dht entry is expired.\n");
+ "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;
rh->authority_chain_tail,
auth);
+ /** try to import pkey if private key available */
+ if (rh->priv_key)
+ process_discovered_authority((char*)name, auth->zone,
+ rh->authority_chain_tail->zone,
+ rh->priv_key);
/**
* We are done with PKEY resolution if name is empty
* else resolve again with new authority
* no answers found
*/
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: Authority lookup and but no PKEY... never get here\n");
- rh->proc(rh->proc_cls, rh, 0, NULL);
+ "GNS_PHASE_DELEGATE_NS-%llu: Authority lookup and no PKEY...\n", rh->id);
+ /**
+ * If we have found some records for the LAST label
+ * we return the results. Else null.
+ */
+ 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);
+ rh->proc(rh->proc_cls, rh, rd_count, rd);
+ }
+ else
+ {
+ rh->proc(rh->proc_cls, rh, 0, NULL);
+ }
}
resolve_delegation_ns(struct ResolverHandle *rh)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE: Resolving delegation for %s\n", rh->name);
+ "GNS_PHASE_DELEGATE_NS-%llu: Resolving delegation for %s\n",
+ rh->id, rh->name);
pop_tld(rh->name, rh->authority_name);
GNUNET_NAMESTORE_lookup_record(namestore_handle,
&rh->authority,
rh->authority_name,
- GNUNET_GNS_RECORD_PKEY,
+ GNUNET_GNS_RECORD_ANY,
&process_delegation_result_ns,
rh);
struct ResolverHandle *rh;
struct RecordLookupHandle* rlh;
char string_hash[MAX_DNS_LABEL_LENGTH];
- uint8_t* normalized_zkey;
char nzkey[MAX_DNS_LABEL_LENGTH];
- size_t normal_len;
+ char* nzkey_ptr = nzkey;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Starting resolution for %s (type=%d)!\n",
rh = GNUNET_malloc(sizeof (struct ResolverHandle));
rh->authority = zone;
+ rh->id = rid++;
rh->proc_cls = rlh;
rh->priv_key = key;
rh->timeout = timeout;
/*
* Set timeout for authority lookup phase to 1/2
*/
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Timeout for lookup set to %ds\n", rh->timeout.rel_value);
rh->timeout_task = GNUNET_SCHEDULER_add_delayed(
GNUNET_TIME_relative_divide(timeout, 2),
&handle_lookup_timeout,
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"ZKEY is %s!\n", string_hash);
- normalized_zkey = u8_toupper ((uint8_t*)string_hash, strlen ((char *) string_hash),
- NULL, UNINORM_NFD, NULL, &normal_len);
+ GNUNET_STRINGS_utf8_toupper(string_hash, &nzkey_ptr);
- memcpy(nzkey, normalized_zkey, normal_len);
- nzkey[normal_len] = '\0';
- free(normalized_zkey);
-
if (GNUNET_OK != GNUNET_CRYPTO_short_hash_from_string(nzkey,
&rh->authority))
{
free_resolver_handle(rh);
}
else if (GNUNET_CRYPTO_short_hash_cmp(&rh->authority_chain_head->zone,
- &local_zone))
+ &local_zone) == 0)
{
/* our zone, just append .gnunet */
answer_len = strlen(rh->name) + strlen(GNUNET_GNS_TLD) + 2;
* continue with next authority
*/
next_authority = rh->authority_chain_head;
- // strlen(next_authority->name) + 2);
- memset(next_authority_name, 0, strlen(rh->name)+
- strlen(next_authority->name) + 2);
- strcpy(next_authority_name, rh->name);
- strcpy(next_authority_name+strlen(rh->name)+1, ".");
- strcpy(next_authority_name+strlen(rh->name)+2, next_authority->name);
-
+
+ GNUNET_snprintf(next_authority_name, MAX_DNS_NAME_LENGTH,
+ "%s.%s", rh->name, next_authority->name);
+
strcpy(rh->name, next_authority_name);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "No PSEU found for authority %s. Promoting back: %s\n",
+ next_authority->name, rh->name);
+
GNUNET_CONTAINER_DLL_remove(rh->authority_chain_head,
rh->authority_chain_tail,
next_authority);
}
}
+/**
+ * DHT resolution for delegation. Processing result.
+ *
+ * @param cls the closure
+ * @param rh resolver handle
+ * @param rd_count number of results
+ * @param rd record data
+ */
+static void
+handle_delegation_dht_bg_shorten(void* cls, struct ResolverHandle *rh,
+ unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd)
+{
+
+ /* We resolved full name for delegation. resolving record */
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_SHORTEN: Resolved up to %s for delegation via DHT in background.\n",
+ rh->name);
+ free_resolver_handle(rh);
+}
/**
* Process result from namestore delegation lookup
struct NameShortenHandle *nsh;
char result[MAX_DNS_NAME_LENGTH];
size_t answer_len;
+ struct ResolverHandle *rh_bg;
nsh = (struct NameShortenHandle *)cls;
return;
}
+ /**
+ * we have to this before zone to name for rh might
+ * be freed by then
+ */
+ rh_bg = NULL;
+ if (!is_canonical(rh->name))
+ {
+ rh_bg = GNUNET_malloc(sizeof(struct ResolverHandle));
+ memcpy(rh_bg, rh, sizeof(struct ResolverHandle));
+ rh_bg->id = rid++;
+ }
+
/* backtrack authorities for names */
GNUNET_NAMESTORE_zone_to_name (namestore_handle,
&rh->authority_chain_tail->zone, //ours
&rh->authority_chain_head->zone,
&process_zone_to_name_shorten,
rh);
+
+ if (rh_bg == NULL)
+ {
+ return;
+ }
+
+ /**
+ * If authority resolution is incomplete we can do a background lookup
+ * of the full name so that next time we can (likely) fully or at least
+ * further shorten the name
+ */
+ rh_bg->authority_chain_head = GNUNET_malloc(sizeof(struct AuthorityChain));
+ rh_bg->authority_chain_tail = rh_bg->authority_chain_head;
+ rh_bg->authority_chain_head->zone = rh_bg->authority;
+
+ rh_bg->proc = &handle_delegation_dht_bg_shorten;
+ rh_bg->proc_cls = NULL;
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_SHORTEN: Starting background lookup for %s\n",
+ rh_bg->name);
+
+ resolve_delegation_dht(rh_bg);
}
/* zkey not in our zone */
if (name == NULL)
{
+ /**
+ * In this case we have not given this PKEY a name (yet)
+ * It is either just not in our zone or not even cached
+ * Since we do not know at this point we will not try to shorten
+ * because PKEY import will happen if the user follows the zkey
+ * link.
+ */
GNUNET_CRYPTO_short_hash_to_enc ((struct GNUNET_CRYPTO_ShortHashCode*)rd,
&enc);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
/* Start delegation resolution in our namestore */
resolve_delegation_ns(rh);
}
-
+
+
/**
* Shorten api from resolver
*
* @param zone the zone to use
* @param name the name to shorten
+ * @param key optional private key for background lookups and PSEU import
* @param proc the processor to call with result
* @param proc_cls closure to pass to proc
*/
void
gns_resolver_shorten_name(struct GNUNET_CRYPTO_ShortHashCode zone,
const char* name,
+ struct GNUNET_CRYPTO_RsaPrivateKey *key,
ShortenResultProcessor proc,
void* proc_cls)
{
struct NameShortenHandle *nsh;
char string_hash[MAX_DNS_LABEL_LENGTH];
struct GNUNET_CRYPTO_ShortHashCode zkey;
- uint8_t* normalized_zkey;
- size_t normal_len;
char nzkey[MAX_DNS_LABEL_LENGTH];
+ char* nzkey_ptr = nzkey;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
rh = GNUNET_malloc(sizeof (struct ResolverHandle));
rh->authority = zone;
+ rh->id = rid++;
+ rh->priv_key = key;
rh->proc = &handle_delegation_ns_shorten;
rh->proc_cls = nsh;
+ rh->id = rid++;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Checking for TLD...\n");
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"ZKEY is %s!\n", string_hash);
-
- normalized_zkey = u8_toupper ((uint8_t*)string_hash, strlen ((char *) string_hash),
- NULL, UNINORM_NFD, NULL, &normal_len);
-
- memcpy(nzkey, normalized_zkey, normal_len);
- nzkey[normal_len] = '\0';
- free(normalized_zkey);
+
+ GNUNET_STRINGS_utf8_toupper(string_hash, &nzkey_ptr);
if (GNUNET_OK != GNUNET_CRYPTO_short_hash_from_string(nzkey,
&zkey))
nah = GNUNET_malloc(sizeof (struct GetNameAuthorityHandle));
rh = GNUNET_malloc(sizeof (struct ResolverHandle));
rh->authority = zone;
+ rh->id = rid++;
if (strcmp(GNUNET_GNS_TLD, name) == 0)
{