#include "gns.h"
#define DHT_OPERATION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+#define DHT_LOOKUP_TIMEOUT DHT_OPERATION_TIMEOUT
#define DHT_GNS_REPLICATION_LEVEL 5
/* Ignore for now not used anyway and probably never will */
/* a handle for dht lookups. should be NULL if no lookups are in progress */
struct GNUNET_DHT_GetHandle *get_handle;
+ /* timeout task for dht lookups */
+ GNUNET_SCHEDULER_TaskIdentifier dht_timeout_task;
+
};
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
/* Kill zone task for it may make the scheduler hang */
- GNUNET_SCHEDULER_cancel(zone_update_taskid);
+ if (zone_update_taskid)
+ GNUNET_SCHEDULER_cancel(zone_update_taskid);
GNUNET_DNS_disconnect(dns_handle);
- GNUNET_NAMESTORE_disconnect(namestore_handle, 0);
+ GNUNET_NAMESTORE_disconnect(namestore_handle, 1);
GNUNET_DHT_disconnect(dht_handle);
}
"Error putting records into namestore: %s\n", emsg);
}
+/**
+ * Handle timeout for DHT requests
+ *
+ * @param cls the request handle as closure
+ * @param tc the task context
+ */
+static void
+dht_lookup_timeout(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_GNS_ResolverHandle *rh = cls;
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "dht lookup for query %s (type=%d) timed out.\n",
+ rh->name, rh->query->type);
+
+ GNUNET_DHT_get_stop (rh->get_handle);
+ reply_to_dns(rh, 0, NULL);
+}
+
/**
* Function called when we get a result from the dht
* for our query
rh = (struct GNUNET_GNS_ResolverHandle *)cls;
nrb = (struct GNSNameRecordBlock*)data;
+ /* stop dht lookup and timeout task */
GNUNET_DHT_get_stop (rh->get_handle);
+ GNUNET_SCHEDULER_cancel(rh->dht_timeout_task);
rh->get_handle = NULL;
num_records = ntohl(nrb->rd_count);
{
struct GNUNET_NAMESTORE_RecordData rd[num_records];
- rd_data += strlen(name) + sizeof(struct GNSNameRecordBlock);
- rd_size = size - strlen(name) - sizeof(struct GNSNameRecordBlock);
+ rd_data += strlen(name) + 1 + sizeof(struct GNSNameRecordBlock);
+ rd_size = size - strlen(name) - 1 - sizeof(struct GNSNameRecordBlock);
if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (rd_size,
rd_data,
&name_hash);
GNUNET_CRYPTO_hash_xor(&name_hash, &rh->authority, &lookup_key);
-
+ rh->dht_timeout_task = GNUNET_SCHEDULER_add_delayed (DHT_LOOKUP_TIMEOUT,
+ &dht_lookup_timeout, rh);
+
xquery = htonl(GNUNET_GNS_RECORD_PKEY);
//FIXME how long to wait for results?
rh->get_handle = GNUNET_DHT_get_start(dht_handle,
rh = (struct GNUNET_GNS_ResolverHandle *)cls;
nrb = (struct GNSNameRecordBlock*)data;
-
+
+ /* stop lookup and timeout task */
GNUNET_DHT_get_stop (rh->get_handle);
+ GNUNET_SCHEDULER_cancel(rh->dht_timeout_task);
rh->get_handle = NULL;
name = (char*)&nrb[1];
{
struct GNUNET_NAMESTORE_RecordData rd[num_records];
- rd_data += strlen(name) + sizeof(struct GNSNameRecordBlock);
- rd_size = size - strlen(name) - sizeof(struct GNSNameRecordBlock);
+ rd_data += strlen(name) + 1 + sizeof(struct GNSNameRecordBlock);
+ rd_size = size - strlen(name) - 1 - sizeof(struct GNSNameRecordBlock);
if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (rd_size,
rd_data,
}
+
+
+
/**
* Start DHT lookup for a (name -> query->record_type) record in
* query->authority's zone
GNUNET_HashCode lookup_key;
struct GNUNET_CRYPTO_HashAsciiEncoded lookup_key_string;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "A\n");
+
GNUNET_CRYPTO_hash(name, strlen(name), &name_hash);
GNUNET_CRYPTO_hash_xor(&name_hash, &rh->authority, &lookup_key);
GNUNET_CRYPTO_hash_to_enc (&lookup_key, &lookup_key_string);
"starting dht lookup for %s with key: %s\n",
name, (char*)&lookup_key_string);
+ rh->dht_timeout_task = GNUNET_SCHEDULER_add_delayed(DHT_LOOKUP_TIMEOUT,
+ &dht_lookup_timeout, rh);
+
xquery = htonl(rh->query->type);
//FIXME how long to wait for results?
rh->get_handle = GNUNET_DHT_get_start(dht_handle,
- DHT_OPERATION_TIMEOUT,
+ DHT_OPERATION_TIMEOUT,
GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
&lookup_key,
DHT_GNS_REPLICATION_LEVEL,
struct GNUNET_GNS_ResolverHandle *rh;
struct GNUNET_TIME_Relative remaining_time;
GNUNET_HashCode zone;
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Got %d records from authority lookup\n",
+ rd_count);
rh = (struct GNUNET_GNS_ResolverHandle *)cls;
GNUNET_CRYPTO_hash(key,
* _IF_ the current authoritative zone is us we cannot resolve
* _ELSE_ we can still check the _expired_ dht
*/
- if (0 != GNUNET_CRYPTO_hash_cmp(&zone, &zone_hash) &&
+ if ((0 != GNUNET_CRYPTO_hash_cmp(&rh->authority, &zone_hash)) &&
(remaining_time.rel_value == 0))
{
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Authority %s unknown in namestore, trying dht\n",
+ rh->authority_name);
resolve_authority_dht(rh);
return;
}
if (rd[i].record_type != GNUNET_GNS_RECORD_PKEY)
continue;
- if ((GNUNET_TIME_absolute_get_remaining (rd[i].expiration)).rel_value
- == 0)
+ if ((GNUNET_TIME_absolute_get_remaining (rd[i].expiration)).rel_value
+ == 0)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "This pkey is expired.\n");
+ if (remaining_time.rel_value == 0)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "This pkey is expired.\n");
- if (remaining_time.rel_value == 0)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "This dht entry is expired. Refreshing\n");
- resolve_authority_dht(rh);
- }
-
- continue;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "This dht entry is expired. Refreshing\n");
+ resolve_authority_dht(rh);
}
- /**
- * Resolve rest of query with new authority
- */
- GNUNET_assert(rd[i].record_type == GNUNET_GNS_RECORD_PKEY);
- GNUNET_CRYPTO_hash(rd[i].data,
- sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &rh->authority);
- resolve_name(rh);
- return;
-
+ continue;
+ }
+
+ /**
+ * Resolve rest of query with new authority
+ */
+ GNUNET_assert(rd[i].record_type == GNUNET_GNS_RECORD_PKEY);
+ GNUNET_CRYPTO_hash(rd[i].data,
+ sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ &rh->authority);
+ resolve_name(rh);
+ return;
}
/**
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"trying dht...\n");
- resolve_name_dht(rh, name);
+ resolve_name_dht(rh, rh->name);
return;
}
else
{
struct GNUNET_GNS_ResolverHandle *rh;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting resolution for (%s)!\n",
- q->name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting resolution for %s (type=%d)!\n",
+ q->name, q->type);
rh = GNUNET_malloc(sizeof (struct GNUNET_GNS_ResolverHandle));
rh->packet = p;
}
-/**
- * test function that stores some data in the namestore
- * This will also be replaced by a test progrm that
- * directl interfaces with the namestore
- */
-static void
-put_some_records(void)
-{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Populating namestore\n");
- /* put an A record into namestore FIXME use gnunet.org */
- char* ipB = "5.6.7.8";
-
- struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr));
- struct GNUNET_NAMESTORE_RecordData rdb_web;
-
- GNUNET_assert(1 == inet_pton (AF_INET, ipB, web));
-
- rdb_web.data_size = sizeof(struct in_addr);
- rdb_web.data = web;
- rdb_web.record_type = GNUNET_DNSPARSER_TYPE_A;
- rdb_web.expiration = GNUNET_TIME_absolute_get_forever ();
-
- GNUNET_NAMESTORE_record_create (namestore_handle,
- zone_key,
- "www",
- &rdb_web,
- NULL,
- NULL);
-}
-
/**
* Method called periodicattluy that triggers
* iteration over root zone
nrb_data = (char*)&nrb[1];
nrb_data += strlen(name) + 1;
+ rd_payload_length += sizeof(struct GNSNameRecordBlock) +
+ strlen(name) + 1;
+
if (-1 == GNUNET_NAMESTORE_records_serialize (rd_count,
rd,
rd_payload_length,
nrb_data))
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Recor serialization failed!\n");
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n");
+ return;
+ //FIXME what to do
}
(char*)nrb,
expiration,
DHT_OPERATION_TIMEOUT,
- &record_dht_put, //FIXME continuation needed? success check? yes ofc
+ &record_dht_put,
NULL); //cls for cont
num_public_records++;
}
-/**
- * Puts a single trusted entity into the
- * namestore. Will be replaced in a testcase
- * that directly interacts with a persistent
- * namestore.
- *
- * @param name name of entity
- * @param keyfile keyfile
- */
-static void
-put_trusted(char* name, char* keyfile)
-{
- struct GNUNET_NAMESTORE_RecordData rd;
- struct GNUNET_CRYPTO_RsaPrivateKey *key;
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pkey;
- pkey = GNUNET_malloc(sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
-
- key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
- GNUNET_CRYPTO_rsa_key_get_public (key, pkey);
- rd.data = pkey;
- rd.expiration = GNUNET_TIME_absolute_get_forever ();
- rd.data_size = sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded);
- rd.record_type = GNUNET_GNS_RECORD_PKEY;
-
- GNUNET_NAMESTORE_record_create (namestore_handle,
- zone_key,
- name,
- &rd,
- NULL,
- NULL);
-}
-
-
-
/**
* Periodically iterate over our zone and store everything in dht
*
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Initializing GNS\n");
char* keyfile;
- char* trusted_entities;
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (c, "gns",
return;
}
- char* trusted_start;
- char* trusted_name;
- char *trusted_key;
- int trusted_len;
- if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (c, "gns",
- "TRUSTED",
- &trusted_entities))
- {
- trusted_start = trusted_entities;
- trusted_len = strlen(trusted_entities);
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Found trusted entities in config file, importing\n");
- while ((trusted_entities-trusted_start) < trusted_len)
- {
- trusted_name = trusted_entities;
- while (*trusted_entities != ':')
- trusted_entities++;
- *trusted_entities = '\0';
- trusted_entities++;
- trusted_key = trusted_entities;
- while (*trusted_entities != ',' && (*trusted_entities != '\0'))
- trusted_entities++;
- *trusted_entities = '\0';
- trusted_entities++;
-
- if (GNUNET_YES == GNUNET_DISK_file_test (trusted_key))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Adding %s:%s to root zone\n",
- trusted_name,
- trusted_key);
- put_trusted(trusted_name, trusted_key);
- }
- else
- {
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Keyfile %s does not exist!\n",
- trusted_key);
- //put_trusted(trusted_name, trusted_key); //FIXME for testing
- }
- }
-
- }
-
/**
* handle to the dht
*/
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Could not connect to DHT!\n");
}
- put_some_records(); //FIXME for testing
+ //put_some_records(); //FIXME for testing
/**
* Schedule periodic put
*/
dht_update_interval = GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS,
1);
- zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_start, NULL);
+ //zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_start, NULL);
}
projects / oweals / gnunet.git / blobdiff