*/
/**
- *
- * TODO:
- * - Write xquery and block plugin
- * - Think about mixed dns queries (.gnunet and .org)
- * - (de-)serialisation of records/signature trees
- * - The smaller FIXME issues all around
*
* @file gns/gnunet-service-gns.c
* @brief GNUnet GNS service
#include "gnunet_dht_service.h"
#include "gnunet_namestore_service.h"
#include "gnunet_gns_service.h"
+#include "block_gns.h"
#include "gns.h"
+#include "gnunet-service-gns_resolver.h"
+#include "gnunet-service-gns_interceptor.h"
-/* Ignore for now not used anyway and probably never will */
-#define GNUNET_MESSAGE_TYPE_GNS_CLIENT_LOOKUP 23
-#define GNUNET_MESSAGE_TYPE_GNS_CLIENT_RESULT 24
-
-struct GNUNET_GNS_QueryRecordList
-{
- /**
- * DLL
- */
- struct GNUNET_GNS_QueryRecordList * next;
- struct GNUNET_GNS_QueryRecordList * prev;
+/* FIXME move to proper header in include */
+#define GNUNET_MESSAGE_TYPE_GNS_LOOKUP 23
+#define GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT 24
+#define GNUNET_MESSAGE_TYPE_GNS_SHORTEN 25
+#define GNUNET_MESSAGE_TYPE_GNS_SHORTEN_RESULT 26
+#define GNUNET_MESSAGE_TYPE_GNS_GET_AUTH 27
+#define GNUNET_MESSAGE_TYPE_GNS_GET_AUTH_RESULT 28
- struct GNUNET_DNSPARSER_Record * record;
-};
/**
- * A result list for namestore queries
+ * Handle to a shorten operation from api
*/
-struct GNUNET_GNS_PendingQuery
+struct ClientShortenHandle
{
- /* the answer packet */
- struct GNUNET_DNSPARSER_Packet *answer;
+ /* the requesting client that */
+ struct GNUNET_SERVER_Client *client;
- /* records to put into answer packet */
- struct GNUNET_GNS_QueryRecordList * records_head;
- struct GNUNET_GNS_QueryRecordList * records_tail;
+ /* request id */
+ uint64_t unique_id;
- int num_records;
- int num_authority_records; //FIXME are all of our replies auth?
-
- char *original_name;
- char *name;
+ /* request type */
+ enum GNUNET_GNS_RecordType type;
+
+ /* name to shorten */
+ char* name;
- uint16_t type;
- /* the dns request id */
- int id; // FIXME can handle->request_id also be used here?
+};
- /* the request handle to reply to */
- struct GNUNET_DNS_RequestHandle *request_handle;
- /* hast this query been answered? */
- int answered;
+/**
+ * Handle to a get auhtority operation from api
+ */
+struct ClientGetAuthHandle
+{
+ /* the requesting client that */
+ struct GNUNET_SERVER_Client *client;
+
+ /* request id */
+ uint64_t unique_id;
- /* the authoritative zone to query */
- GNUNET_HashCode *authority;
+ /* name to lookup authority */
+ char* name;
- /* we have an authority in namestore that
- * may be able to resolve
- */
- int authority_found;
};
/**
- * Our handle to the DNS handler library
+ * Handle to a lookup operation from api
*/
-struct GNUNET_DNS_Handle *dns_handle;
+struct ClientLookupHandle
+{
+ /* the requesting client that */
+ struct GNUNET_SERVER_Client *client;
+
+ /* request id */
+ uint64_t unique_id;
+
+ /* request type */
+ enum GNUNET_GNS_RecordType type;
+
+ /* the name to look up */
+ char* name; //Needed?
+};
/**
* Our handle to the DHT
*/
-struct GNUNET_DHT_Handle *dht_handle;
-
-struct GNUNET_TIME_Relative dht_update_interval;
+static struct GNUNET_DHT_Handle *dht_handle;
/**
* Our zone's private key
/**
* Our handle to the namestore service
+ * FIXME maybe need a second handle for iteration
*/
struct GNUNET_NAMESTORE_Handle *namestore_handle;
+/**
+ * Handle to iterate over our authoritative zone in namestore
+ */
+struct GNUNET_NAMESTORE_ZoneIterator *namestore_iter;
+
/**
* The configuration the GNS service is running with
*/
/**
* Our zone hash
*/
-GNUNET_HashCode zone_hash;
+struct GNUNET_CRYPTO_ShortHashCode zone_hash;
/**
- * Our tld. Maybe get from config file
+ * Useful for zone update for DHT put
*/
-const char* gnunet_tld = ".gnunet";
+static int num_public_records = 3600;
/**
- * Task run during shutdown.
- *
- * @param cls unused
- * @param tc unused
+ * update interval in seconds
*/
-static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- GNUNET_DNS_disconnect(dns_handle);
- GNUNET_NAMESTORE_disconnect(namestore_handle, 0);
- GNUNET_DHT_disconnect(dht_handle);
-}
+static unsigned long long int dht_max_update_interval;
+
+/* dht update interval FIXME define? */
+static struct GNUNET_TIME_Relative dht_update_interval;
+
+/* zone update task */
+GNUNET_SCHEDULER_TaskIdentifier zone_update_taskid = GNUNET_SCHEDULER_NO_TASK;
+
+/* automatic pkey import for name shortening */
+static int auto_import_pkey;
+
+/* lookup timeout */
+static struct GNUNET_TIME_Relative default_lookup_timeout;
/**
- * Function called when we get a result from the dht
- * for our query
- *
- * @param cls the query 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
+ * Continue shutdown
*/
-void
-process_authority_dht_result(void* cls,
- struct GNUNET_TIME_Absolute exp,
- const 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)
+static void
+on_resolver_cleanup(void)
{
- if (data == NULL)
- return;
-
- /**
- * data is a serialized PKEY record (probably)
- * parse, put into namestore
- * namestore zone hash is in query.
- * Then adjust query->name and call resolve_name
- * with new zone (the one just received)
- *
- * query->authority = new_authority
- * resolve_name(query, new_authority);
- */
+ GNUNET_NAMESTORE_disconnect(namestore_handle, 1);
+ GNUNET_DHT_disconnect(dht_handle);
}
/**
- * Start DHT lookup for a name -> PKEY (compare NS) record in
- * query->authority's zone
+ * Task run during shutdown.
*
- * @param query the pending gns query
- * @param name the name of the PKEY record
+ * @param cls unused
+ * @param tc unused
*/
-void
-resolve_authority_dht(struct GNUNET_GNS_PendingQuery *query, const char* name)
+static void
+shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- enum GNUNET_GNS_RecordType rtype = GNUNET_GNS_RECORD_PKEY;
- struct GNUNET_TIME_Relative timeout;
- GNUNET_HashCode name_hash;
- GNUNET_HashCode lookup_key;
-
- GNUNET_CRYPTO_hash(name, strlen(name), &name_hash);
- GNUNET_CRYPTO_hash_xor(&name_hash, query->authority, &lookup_key);
-
- timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20);
-
- //FIXME how long to wait for results?
- GNUNET_DHT_get_start(dht_handle, timeout,
- GNUNET_BLOCK_TYPE_TEST, //FIXME todo
- &lookup_key,
- 5, //Replication level FIXME
- GNUNET_DHT_RO_NONE,
- &rtype, //xquery FIXME this is bad
- sizeof(GNUNET_GNS_RECORD_PKEY),
- &process_authority_dht_result,
- query);
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Shutting down!");
+ /* Kill zone task for it may make the scheduler hang */
+ if (zone_update_taskid)
+ GNUNET_SCHEDULER_cancel(zone_update_taskid);
+
+ GNUNET_SERVER_notification_context_destroy (nc);
+
+ gns_interceptor_stop();
+ gns_resolver_cleanup(&on_resolver_cleanup);
}
+
/**
- * Function called when we get a result from the dht
- * for our query
+ * Method called periodicattluy that triggers
+ * iteration over root zone
*
- * @param cls the query 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 cls closure
+ * @param tc task context
*/
-void
-process_name_dht_result(void* cls,
- struct GNUNET_TIME_Absolute exp,
- const 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)
+static void
+update_zone_dht_next(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (data == NULL)
- return;
-
- /**
- * data is a serialized GNS record of type
- * query->record_type. Parse and put into namestore
- * namestore zone hash is in query.
- * Check if record type and name match in query and reply
- * to dns!
- */
+ GNUNET_NAMESTORE_zone_iterator_next(namestore_iter);
}
/**
- * Start DHT lookup for a (name -> query->record_type) record in
- * query->authority's zone
+ * Continuation for DHT put
*
- * @param query the pending gns query
- * @param name the name to query record
+ * @param cls closure
+ * @param tc task context
*/
-void
-resolve_name_dht(struct GNUNET_GNS_PendingQuery *query, const char* name)
+static void
+record_dht_put(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GNUNET_TIME_Relative timeout;
- GNUNET_HashCode name_hash;
- GNUNET_HashCode lookup_key;
-
- GNUNET_CRYPTO_hash(name, strlen(name), &name_hash);
- GNUNET_CRYPTO_hash_xor(&name_hash, query->authority, &lookup_key);
-
- timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20);
-
- //FIXME how long to wait for results?
- GNUNET_DHT_get_start(dht_handle, timeout,
- GNUNET_BLOCK_TYPE_TEST, //FIXME todo
- &lookup_key,
- 5, //Replication level FIXME
- GNUNET_DHT_RO_NONE,
- &query->type, //xquery
- sizeof(query->type),
- &process_name_dht_result,
- query);
-
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "put request transmitted\n");
}
-//Prototype
-void
-resolve_name(struct GNUNET_GNS_PendingQuery *query, GNUNET_HashCode *zone);
+/* prototype */
+static void
+update_zone_dht_start(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
/**
- * This is a callback function that should give us only PKEY
- * records. Used to query the namestore for the authority (PKEY)
- * for 'name'
+ * Function used to put all records successively into the DHT.
*
- * @param cls the pending query
- * @param zone our zone hash
- * @param name the name for which we need an authority
- * @param record_type the type of record (PKEY)
- * @param expiration expiration date of the record
- * @param flags namestore record flags
- * @param sig_loc the location of the record in the signature tree
- * @param size the size of the record
- * @param data the record data
+ * @param cls the closure (NULL)
+ * @param key the public key of the authority (ours)
+ * @param expiration lifetime of the namestore entry
+ * @param name the name of the records
+ * @param rd_count the number of records in data
+ * @param rd the record data
+ * @param signature the signature for the record data
*/
-void
-process_authority_lookup(void* cls, const GNUNET_HashCode *zone,
- const char *name, uint32_t record_type,
- struct GNUNET_TIME_Absolute expiration,
- enum GNUNET_NAMESTORE_RecordFlags flags,
- size_t size, const void *data)
+static void
+put_gns_record(void *cls,
+ const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *key,
+ struct GNUNET_TIME_Absolute expiration,
+ const char *name,
+ unsigned int rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd,
+ const struct GNUNET_CRYPTO_RsaSignature *signature)
{
- struct GNUNET_GNS_PendingQuery *query;
-
- query = (struct GNUNET_GNS_PendingQuery *)cls;
- /**
- * No authority found in namestore.
- */
- if (NULL == data)
+ struct GNSNameRecordBlock *nrb;
+ struct GNUNET_CRYPTO_ShortHashCode name_hash;
+ GNUNET_HashCode xor_hash;
+ GNUNET_HashCode name_hash_double;
+ GNUNET_HashCode zone_hash_double;
+ struct GNUNET_CRYPTO_HashAsciiEncoded xor_hash_string;
+ uint32_t rd_payload_length;
+ char* nrb_data = NULL;
+ size_t namelen;
+
+ /* we're done */
+ if (NULL == name)
{
- if (query->authority_found)
- {
- query->authority_found = 0;
- resolve_name(query, query->authority);
- return;
- }
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Zone iteration finished. Rescheduling put in %ds\n",
+ dht_max_update_interval);
+ zone_update_taskid = GNUNET_SCHEDULER_add_delayed (
+ GNUNET_TIME_relative_multiply(
+ GNUNET_TIME_UNIT_SECONDS,
+ dht_max_update_interval
+ ),
+ &update_zone_dht_start,
+ NULL);
+ return;
+ }
+
+ namelen = strlen(name) + 1;
+
+ if (signature == NULL)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ "No signature for %s record data provided! Skipping...\n",
+ name);
+ zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_next,
+ NULL);
+ return;
- /**
- * We did not find an authority in the namestore
- * _IF_ the current authoritative zone is us.
- * we cannot resolve
- * _ELSE_ we cannot still check the dht
- */
- if (GNUNET_CRYPTO_hash_cmp(zone, &zone_hash))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Authority unknown\n");
- //FIXME return NX answer
- return;
- }
+ }
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Putting records for %s into the DHT\n", name);
+
+ rd_payload_length = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
+
+ nrb = GNUNET_malloc(rd_payload_length + namelen
+ + sizeof(struct GNSNameRecordBlock));
+
+ nrb->signature = *signature;
+
+ nrb->public_key = *key;
+
+ nrb->rd_count = htonl(rd_count);
+
+ memcpy(&nrb[1], name, namelen);
+
+ nrb_data = (char*)&nrb[1];
+ nrb_data += namelen;
- resolve_authority_dht(query, name);
+ rd_payload_length += sizeof(struct GNSNameRecordBlock) + namelen;
+
+ if (-1 == GNUNET_NAMESTORE_records_serialize (rd_count,
+ rd,
+ rd_payload_length,
+ nrb_data))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ "Record serialization failed! Skipping...\n");
+ GNUNET_free(nrb);
+ zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_next,
+ NULL);
return;
}
+
+
+ /*
+ * calculate DHT key: H(name) xor H(pubkey)
+ */
+ GNUNET_CRYPTO_short_hash(name, strlen(name), &name_hash);
+ GNUNET_CRYPTO_short_hash_double (&name_hash, &name_hash_double);
+ GNUNET_CRYPTO_short_hash_double (&zone_hash, &zone_hash_double);
+ GNUNET_CRYPTO_hash_xor(&zone_hash_double, &name_hash_double, &xor_hash);
+ GNUNET_CRYPTO_hash_to_enc (&xor_hash, &xor_hash_string);
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "putting records for %s under key: %s with size %d\n",
+ name, (char*)&xor_hash_string, rd_payload_length);
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "DHT req to %d\n", DHT_OPERATION_TIMEOUT.rel_value);
+
+ GNUNET_DHT_put (dht_handle, &xor_hash,
+ DHT_GNS_REPLICATION_LEVEL,
+ GNUNET_DHT_RO_NONE,
+ GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
+ rd_payload_length,
+ (char*)nrb,
+ expiration,
+ DHT_OPERATION_TIMEOUT,
+ &record_dht_put,
+ NULL); //cls for cont
+ num_public_records++;
+
/**
- * We found an authority that may be able to help us
- * move on with query
+ * Reschedule periodic put
*/
- query->authority_found = 1;
- GNUNET_HashCode *key = (GNUNET_HashCode*) data; //FIXME i assume this works
- query->authority = key;
-
-}
+ zone_update_taskid = GNUNET_SCHEDULER_add_delayed (dht_update_interval,
+ &update_zone_dht_next,
+ NULL);
+ GNUNET_free(nrb);
+
+}
/**
- * Reply to client with the result from our lookup.
+ * Periodically iterate over our zone and store everything in dht
*
- * @param answer the pending query used in the lookup
+ * @param cls NULL
+ * @param tc task context
*/
-void
-reply_to_dns(struct GNUNET_GNS_PendingQuery *answer)
+static void
+update_zone_dht_start(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GNUNET_GNS_QueryRecordList *i;
- struct GNUNET_DNSPARSER_Packet *packet;
- struct GNUNET_DNSPARSER_Flags dnsflags;
- int j;
- size_t len;
- int ret;
- char *buf;
-
- packet = GNUNET_malloc(sizeof(struct GNUNET_DNSPARSER_Packet));
- packet->answers =
- GNUNET_malloc(sizeof(struct GNUNET_DNSPARSER_Record) * answer->num_records);
-
- len = sizeof(struct GNUNET_DNSPARSER_Record*);
- j = 0;
- for (i=answer->records_head; i != NULL; i=i->next)
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Scheduling DHT zone update!\n");
+ if (0 == num_public_records)
{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Adding %s to DNS response\n", i->record->name);
- memcpy(&packet->answers[j],
- i->record,
- sizeof (struct GNUNET_DNSPARSER_Record));
- GNUNET_free(i->record);
- j++;
- }
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "after memcpy\n");
- /* FIXME how to handle auth, additional etc */
- packet->num_answers = answer->num_records;
- packet->num_authority_records = answer->num_authority_records;
-
- dnsflags.authoritative_answer = 1;
- dnsflags.opcode = GNUNET_DNSPARSER_OPCODE_QUERY;
- dnsflags.return_code = GNUNET_DNSPARSER_RETURN_CODE_NO_ERROR; //not sure
- dnsflags.query_or_response = 1;
- packet->flags = dnsflags;
-
- packet->id = answer->id;
-
- //FIXME this is silently discarded
- ret = GNUNET_DNSPARSER_pack (packet,
- 1024, /* FIXME magic from dns redirector */
- &buf,
- &len);
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Built DNS response! (ret=%d)\n", ret);
- if (ret == GNUNET_OK)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Answering DNS request\n");
- GNUNET_DNS_request_answer(answer->request_handle,
- len,
- buf);
- //GNUNET_free(answer);
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Answered DNS request\n");
- //FIXME return code, free datastructures
+ dht_update_interval = GNUNET_TIME_relative_multiply(
+ GNUNET_TIME_UNIT_SECONDS,
+ dht_max_update_interval);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "No records in db. Adjusted DHT update interval to %ds\n",
+ dht_max_update_interval);
}
else
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Error building DNS response! (ret=%d)", ret);
+
+ dht_update_interval = GNUNET_TIME_relative_multiply(
+ GNUNET_TIME_UNIT_SECONDS,
+ (dht_max_update_interval/num_public_records));
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Adjusted DHT update interval to %ds!\n",
+ (dht_max_update_interval/num_public_records));
}
+
+ /* start counting again */
+ num_public_records = 0;
+ namestore_iter = GNUNET_NAMESTORE_zone_iteration_start (namestore_handle,
+ &zone_hash,
+ GNUNET_NAMESTORE_RF_AUTHORITY,
+ GNUNET_NAMESTORE_RF_PRIVATE,
+ &put_gns_record,
+ NULL);
}
+/* END DHT ZONE PROPAGATION */
+
/**
- * Namestore calls this function if we have an entry for this name.
- * (or data=null to indicate the lookup has finished)
- *
- * @param cls the pending query
- * @param zone the zone of the lookup
- * @param name the name looked up
- * @param record_type the record type
- * @param expiration lifetime of the record
- * @param flags record flags
- * @param sig_loc location of the record in the signature tree
- * @param size the size of the record
- * @param data the record data
+ * Send shorten response back to client
+ *
+ * @param cls the closure containing a client shorten handle
+ * @param name the shortened name result or NULL if cannot be shortened
*/
static void
-process_authoritative_result(void* cls, const GNUNET_HashCode *zone,
- const char *name, uint32_t record_type,
- struct GNUNET_TIME_Absolute expiration,
- enum GNUNET_NAMESTORE_RecordFlags flags,
- size_t size, const void *data)
+send_shorten_response(void* cls, const char* name)
{
- struct GNUNET_GNS_PendingQuery *query;
- struct GNUNET_GNS_QueryRecordList *qrecord;
- struct GNUNET_DNSPARSER_Record *record;
- query = (struct GNUNET_GNS_PendingQuery *) cls;
-
-
- if (NULL == data)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message with %s\n",
+ "SHORTEN_RESULT", name);
+ struct GNUNET_GNS_ClientShortenResultMessage *rmsg;
+ struct ClientShortenHandle *csh = (struct ClientShortenHandle *)cls;
+
+ if (name == NULL)
{
- /**
- * FIXME
- * Lookup terminated
- * Do we have what we need to answer?
- * If not -> DHT Phase
- * if full_name == next_name and not anwered we cannot resolve
- */
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Namestore lookup terminated. (answered=%d)", query->answered);
- if (query->answered)
- {
- reply_to_dns(query);
- return;
- }
-
- /**
- * if this is not our zone we cannot rely on the namestore to be
- * complete. -> Query DHT
- */
- if (!GNUNET_CRYPTO_hash_cmp(zone, &zone_hash))
- {
- //FIXME todo
- resolve_name_dht(query, name);
- return;
- }
-
- /**
- * Our zone and no result? Cannot resolve TT
- * FIXME modify query to say NX
- */
- return;
-
+ name = "";
}
- else
- {
- /**
- * Record found
- */
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Processing additional result for %s from namestore\n", name);
- qrecord = GNUNET_malloc(sizeof(struct GNUNET_GNS_QueryRecordList));
- record = GNUNET_malloc(sizeof(struct GNUNET_DNSPARSER_Record));
- qrecord->record = record;
-
- record->name = (char*)query->original_name;
+ rmsg = GNUNET_malloc(sizeof(struct GNUNET_GNS_ClientShortenResultMessage)
+ + strlen(name) + 1);
+
+ rmsg->id = csh->unique_id;
+ rmsg->header.type = htons(GNUNET_MESSAGE_TYPE_GNS_SHORTEN_RESULT);
+ rmsg->header.size =
+ htons(sizeof(struct GNUNET_GNS_ClientShortenResultMessage) +
+ strlen(name) + 1);
+
+ strcpy((char*)&rmsg[1], name);
+
+ GNUNET_SERVER_notification_context_unicast (nc, csh->client,
+ (const struct GNUNET_MessageHeader *) rmsg,
+ GNUNET_NO);
+ GNUNET_SERVER_receive_done (csh->client, GNUNET_OK);
+
+ GNUNET_free(rmsg);
+ GNUNET_free_non_null(csh->name);
+ GNUNET_free(csh);
- /**
- * FIXME for gns records this requires the dnsparser to be modified!
- * or use RAW. But RAW data need serialization!
- * maybe store record data appropriately in namestore to avoid a
- * huge switch statement?
- */
- if (record_type == GNUNET_DNSPARSER_TYPE_A)
- {
- record->data.raw.data = (char*)data;
- record->data.raw.data_len = size;
- }
- record->expiration_time = expiration;
- record->type = record_type;
- record->class = GNUNET_DNSPARSER_CLASS_INTERNET; /* srsly? */
-
- //FIXME authoritative answer if we find a result in namestore
- if (flags == GNUNET_NAMESTORE_RF_AUTHORITY)
- {
- //query->num_authority_records++;
- }
-
- /**
- * This seems to take into account that the result could
- * be different in name and or record type...
- * but to me this does not make sense
- */
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Found answer to query!\n");
- query->answered = 1;
-
- query->num_records++;
-
- /**
- * FIXME watch for leaks
- * properly free pendingquery when the time comes
- */
- GNUNET_CONTAINER_DLL_insert(query->records_head,
- query->records_tail,
- qrecord);
- }
}
/**
- * Determine if this name is canonical.
- * i.e.
- * a.b.gnunet = not canonical
- * a = canonical
+ * Handle a shorten message from the api
*
- * @param name the name to test
- * @return 1 if canonical
+ * @param cls the closure
+ * @param client the client
+ * @param message the message
*/
-int
-is_canonical(char* name)
+static void handle_shorten(void *cls,
+ struct GNUNET_SERVER_Client * client,
+ const struct GNUNET_MessageHeader * message)
{
- uint32_t len = strlen(name);
- int i;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "SHORTEN");
+
+ size_t msg_size = 0;
+ struct ClientShortenHandle *csh;
+ char name[MAX_DNS_NAME_LENGTH];
+ char* nameptr = name;
- for (i=0; i<len; i++)
+ if (ntohs (message->size) < sizeof (struct GNUNET_GNS_ClientShortenMessage))
{
- if (*(name+i) == '.')
- return 0;
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
}
- return 1;
-}
-/**
- * Move one level up in the domain hierarchy and return the
- * passed top level domain.
- * FIXME this needs a better name
- *
- * @param name the domain
- * @return the tld
- */
-char* move_up(char* name)
-{
- uint32_t len;
+ GNUNET_SERVER_notification_context_add (nc, client);
- if (is_canonical(name))
- return NULL;
+ struct GNUNET_GNS_ClientShortenMessage *sh_msg =
+ (struct GNUNET_GNS_ClientShortenMessage *) message;
+
+ msg_size = ntohs(message->size);
- for (len = strlen(name); len > 0; len--)
+ if (msg_size > GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
- if (*(name+len) == '.')
- break;
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
}
- if (len == 0)
- return NULL; //Error
-
- name[len] = '\0'; //terminate string
+ csh = GNUNET_malloc(sizeof(struct ClientShortenHandle));
+ csh->client = client;
+ csh->unique_id = sh_msg->id;
+
+ GNUNET_STRINGS_utf8_tolower((char*)&sh_msg[1], &nameptr);
- return (name+len+1);
+ if (strlen (name) < strlen(GNUNET_GNS_TLD)) {
+ csh->name = NULL;
+ send_shorten_response(csh, name);
+ return;
+ }
+
+ if (!is_gnunet_tld(name) && !is_zkey_tld(name))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%s is not our domain. Returning\n", name);
+ csh->name = NULL;
+ send_shorten_response(csh, name);
+ return;
+ }
+
+ /* Start shortening */
+ if (GNUNET_YES == auto_import_pkey)
+ gns_resolver_shorten_name(zone_hash, name, zone_key,
+ &send_shorten_response, csh);
+ else
+ gns_resolver_shorten_name(zone_hash, name, NULL,
+ &send_shorten_response, csh);
}
/**
- * The first phase of resolution.
- * First check if the name is canonical.
- * If it is then try to resolve directly.
- * If not then first have to resolve the authoritative entities.
- *
- * @param query the pending lookup
- * @param zone the zone we are currently resolving in
+ * Send get authority response back to client
+ *
+ * @param cls the closure containing a client get auth handle
+ * @param name the shortened name result or NULL if cannot be shortened
*/
-void
-resolve_name(struct GNUNET_GNS_PendingQuery *query, GNUNET_HashCode *zone)
+static void
+send_get_auth_response(void *cls, const char* name)
{
- if (is_canonical(query->name))
- {
- //We only need to check this zone's ns
- GNUNET_NAMESTORE_lookup_record(namestore_handle,
- zone,
- query->name,
- query->type,
- &process_authoritative_result,
- query);
- }
- else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message with %s\n",
+ "GET_AUTH_RESULT", name);
+ struct GNUNET_GNS_ClientGetAuthResultMessage *rmsg;
+ struct ClientGetAuthHandle *cah = (struct ClientGetAuthHandle *)cls;
+
+ if (name == NULL)
{
- //We have to resolve the authoritative entity
- char *new_authority = move_up(query->name);
- GNUNET_NAMESTORE_lookup_record(namestore_handle,
- zone,
- new_authority,
- GNUNET_GNS_RECORD_PKEY,
- &process_authority_lookup,
- query);
+ name = "";
}
-}
-/**
- * Entry point for name resolution
- * Lookup local namestore of our zone.
- *
- * Setup a new query and try to resolve
- *
- * @param rh the request handle of the DNS request from a client
- * @param name the name to look up
- * @param id the id of the dns request (for the reply)
- * @param type the record type to look for
- */
-void
-start_resolution(struct GNUNET_DNS_RequestHandle *rh,
- char* name, uint16_t id, uint16_t type)
-{
- struct GNUNET_GNS_PendingQuery *query;
+ rmsg = GNUNET_malloc(sizeof(struct GNUNET_GNS_ClientGetAuthResultMessage)
+ + strlen(name) + 1);
- //FIXME remove .gnunet here from name
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "This is .gnunet (%s)!\n", name);
- query = GNUNET_malloc(sizeof (struct GNUNET_GNS_PendingQuery));
- query->id = id;
- query->original_name = name; //Full name of original query
+ rmsg->id = cah->unique_id;
+ rmsg->header.type = htons(GNUNET_MESSAGE_TYPE_GNS_GET_AUTH_RESULT);
+ rmsg->header.size =
+ htons(sizeof(struct GNUNET_GNS_ClientGetAuthResultMessage) +
+ strlen(name) + 1);
+
+ strcpy((char*)&rmsg[1], name);
+
+ GNUNET_SERVER_notification_context_unicast (nc, cah->client,
+ (const struct GNUNET_MessageHeader *) rmsg,
+ GNUNET_NO);
+ GNUNET_SERVER_receive_done (cah->client, GNUNET_OK);
- //FIXME do not forget to free!!
- query->name = GNUNET_malloc(strlen(name)-strlen(gnunet_tld) + 1);
- memset(query->name, 0, strlen(name)-strlen(gnunet_tld) + 1);
- memcpy(query->name, name, strlen(name)-strlen(gnunet_tld));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Cleaning up handles...\n");
- query->type = type;
- query->request_handle = rh;
+ GNUNET_free(rmsg);
+ GNUNET_free_non_null(cah->name);
+ GNUNET_free(cah);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "done.\n");
- //Start resolution in our zone
- resolve_name(query, &zone_hash);
}
+
/**
- * The DNS request handler
- * Called for every incoming DNS request.
+ * Handle a get authority message from the api
*
- * @param cls closure
- * @param rh request handle to user for reply
- * @param request_length number of bytes in request
- * @param request udp payload of the DNS request
+ * @param cls the closure
+ * @param client the client
+ * @param message the message
*/
-void
-handle_dns_request(void *cls,
- struct GNUNET_DNS_RequestHandle *rh,
- size_t request_length,
- const char *request)
+static void handle_get_authority(void *cls,
+ struct GNUNET_SERVER_Client * client,
+ const struct GNUNET_MessageHeader * message)
{
- struct GNUNET_DNSPARSER_Packet *p;
- int i;
- char *tldoffset;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "GET_AUTH");
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Hijacked a DNS request...processing\n");
- p = GNUNET_DNSPARSER_parse (request, request_length);
+ size_t msg_size = 0;
+ struct ClientGetAuthHandle *cah;
+ char name[MAX_DNS_NAME_LENGTH];
+ char* nameptr = name;
+
+
+ if (ntohs (message->size) < sizeof (struct GNUNET_GNS_ClientGetAuthMessage))
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+
+ GNUNET_SERVER_notification_context_add (nc, client);
+
+ struct GNUNET_GNS_ClientGetAuthMessage *sh_msg =
+ (struct GNUNET_GNS_ClientGetAuthMessage *) message;
- if (NULL == p)
+ msg_size = ntohs(message->size);
+
+ if (msg_size > GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Received malformed DNS packet, leaving it untouched\n");
- GNUNET_DNS_request_forward (rh);
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- /**
- * Check tld and decide if we or
- * legacy dns is responsible
- *
- * FIXME now in theory there could be more than 1 query in the request
- * but if this is case we get into trouble:
- * either we query the GNS or the DNS. We cannot do both!
- * So I suggest to either only allow a single query per request or
- * only allow GNS or DNS requests.
- * The way it is implemented here now is buggy and will lead to erratic
- * behaviour (if multiple queries are present).
- */
- for (i=0;i<p->num_queries;i++)
+ GNUNET_STRINGS_utf8_tolower((char*)&sh_msg[1], &nameptr);
+
+
+ cah = GNUNET_malloc(sizeof(struct ClientGetAuthHandle));
+ cah->client = client;
+ cah->unique_id = sh_msg->id;
+
+ if (strlen(name) < strlen(GNUNET_GNS_TLD))
{
- tldoffset = p->queries[i].name + strlen(p->queries[i].name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%s is too short. Returning\n", name);
+ cah->name = NULL;
+ send_get_auth_response(cah, name);
+ return;
+ }
- while ((*tldoffset) != '.')
- tldoffset--;
-
- if (0 == strcmp(tldoffset, gnunet_tld))
- {
- start_resolution(rh, p->queries[i].name, p->id, p->queries[i].type);
- }
- else
- {
- /**
- * This request does not concern us. Forward to real DNS.
- */
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- "Request for %s is forwarded to DNS\n", p->queries[i].name);
- GNUNET_DNS_request_forward (rh);
- }
+ if (strcmp(name+strlen(name)-strlen(GNUNET_GNS_TLD),
+ GNUNET_GNS_TLD) != 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%s is not our domain. Returning\n", name);
+ cah->name = NULL;
+ send_get_auth_response(cah, name);
+ return;
}
-}
-/**
- * test function that stores some data in the namestore
- */
-void
-put_some_records(void)
-{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Populating namestore\n");
- /* put a few records into namestore */
- char* ipA = "1.2.3.4";
- char* ipB = "5.6.7.8";
- struct in_addr *alice = GNUNET_malloc(sizeof(struct in_addr));
- struct in_addr *bob = GNUNET_malloc(sizeof(struct in_addr));
- GNUNET_assert(1 == inet_pton (AF_INET, ipA, alice));
- GNUNET_assert(1 == inet_pton (AF_INET, ipB, bob));
- GNUNET_NAMESTORE_record_put (namestore_handle,
- &zone_hash,
- "alice",
- GNUNET_GNS_RECORD_TYPE_A,
- GNUNET_TIME_absolute_get_forever(),
- GNUNET_NAMESTORE_RF_AUTHORITY,
- sizeof(struct in_addr),
- alice,
- NULL,
- NULL);
- GNUNET_NAMESTORE_record_put (namestore_handle,
- &zone_hash,
- "bob",
- GNUNET_GNS_RECORD_TYPE_A,
- GNUNET_TIME_absolute_get_forever(),
- GNUNET_NAMESTORE_RF_AUTHORITY,
- sizeof(struct in_addr),
- bob,
- NULL,
- NULL);
+ if (strcmp(name, GNUNET_GNS_TLD) == 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%s is us. Returning\n", name);
+ cah->name = NULL;
+ send_get_auth_response(cah, name);
+ return;
+ }
+
+ cah->name = GNUNET_malloc(strlen(name)
+ - strlen(GNUNET_GNS_TLD) + 1);
+ memset(cah->name, 0,
+ strlen(name)-strlen(GNUNET_GNS_TLD) + 1);
+ memcpy(cah->name, name,
+ strlen(name)-strlen(GNUNET_GNS_TLD));
+
+ /* Start delegation resolution in our namestore */
+ gns_resolver_get_authority(zone_hash, name, &send_get_auth_response, cah);
}
-//Prototype... needed in put function
-static void
-update_zone_dht(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
/**
- * Function used to put all records successively into the DHT.
- * FIXME also serializes records. maybe do this somewhere else...
- * FIXME don't store private records (maybe zone transfer does this)
+ * Reply to client with the result from our lookup.
*
- * @param cls the closure (NULL)
- * @param zone our root zone hash
- * @param name the name of the record
- * @param record_type the type of the record
- * @param expiration lifetime of the record
- * @param flags flags of the record
- * @param sig_loc location of record in signature tree
- * @param size size of the record
- * @param record_data the record data
+ * @param cls the closure (our client lookup handle)
+ * @param rd_count the number of records
+ * @param rd the record data
*/
-void
-put_gns_record(void *cls, const GNUNET_HashCode *zone, const char *name,
- uint32_t record_type, struct GNUNET_TIME_Absolute expiration,
- enum GNUNET_NAMESTORE_RecordFlags flags,
- size_t size, const void *record_data)
+static void
+send_lookup_response(void* cls,
+ uint32_t rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd)
{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Putting a record into the DHT\n");
- struct GNUNET_TIME_Relative timeout;
-
- char* data;
- char* data_ptr;
- struct GNUNET_TIME_AbsoluteNBO exp_nbo;
- exp_nbo = GNUNET_TIME_absolute_hton (expiration);
- uint32_t namelen = htonl(strlen(name));
- uint16_t flags_nbo = htons(flags);
- GNUNET_HashCode name_hash;
- GNUNET_HashCode xor_hash;
-
- /**
- * I guess this can be done prettier
- * FIXME extract into function, maybe even into different file
- */
- size_t record_len = sizeof(size_t) + sizeof(uint32_t) +
- sizeof(uint16_t) +
- sizeof(uint32_t) + strlen(name) + size;
+ struct ClientLookupHandle* clh = (struct ClientLookupHandle*)cls;
+ struct GNUNET_GNS_ClientLookupResultMessage *rmsg;
+ size_t len;
- record_type = htonl(record_type);
-
- data = GNUNET_malloc(record_len);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message with %d results\n",
+ "LOOKUP_RESULT", rd_count);
+
+ len = GNUNET_NAMESTORE_records_get_size (rd_count, rd);
+ rmsg = GNUNET_malloc(len+sizeof(struct GNUNET_GNS_ClientLookupResultMessage));
- /* -_- */
- data_ptr = data;
- memcpy(data_ptr, &namelen, sizeof(size_t));
- data_ptr += sizeof(size_t);
+ rmsg->id = clh->unique_id;
+ rmsg->rd_count = htonl(rd_count);
+ rmsg->header.type = htons(GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT);
+ rmsg->header.size =
+ htons(len+sizeof(struct GNUNET_GNS_ClientLookupResultMessage));
- memcpy(data_ptr, name, namelen);
- data_ptr += namelen;
+ GNUNET_NAMESTORE_records_serialize (rd_count, rd, len, (char*)&rmsg[1]);
- memcpy(data_ptr, &record_type, sizeof(uint32_t));
- data_ptr += sizeof(uint32_t);
+ GNUNET_SERVER_notification_context_unicast (nc, clh->client,
+ (const struct GNUNET_MessageHeader *) rmsg,
+ GNUNET_NO);
+ GNUNET_SERVER_receive_done (clh->client, GNUNET_OK);
+
+ GNUNET_free(rmsg);
+ GNUNET_free(clh->name);
+ GNUNET_free(clh);
- memcpy(data_ptr, &exp_nbo, sizeof(struct GNUNET_TIME_AbsoluteNBO));
- data_ptr += sizeof(struct GNUNET_TIME_AbsoluteNBO);
+}
- memcpy(data_ptr, &flags_nbo, sizeof(uint16_t));
- data_ptr += sizeof(uint16_t);
- memcpy(data_ptr, &size, sizeof(uint32_t));
- data_ptr += sizeof(uint32_t);
+/**
+ * Handle lookup requests from client
+ *
+ * @param cls the closure
+ * @param client the client
+ * @param message the message
+ */
+static void
+handle_lookup(void *cls,
+ struct GNUNET_SERVER_Client * client,
+ const struct GNUNET_MessageHeader * message)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "LOOKUP");
- /**
- * FIXME note that this only works with raw data in nbo
- * write helper function that converts properly and returns buffer
- */
- memcpy(data_ptr, record_data, size);
- data_ptr += size;
- /*Doing this made me sad...*/
+ size_t msg_size = 0;
+ size_t namelen;
+ char name[MAX_DNS_NAME_LENGTH];
+ struct ClientLookupHandle *clh;
+ char* nameptr = name;
- /**
- * FIXME magic number 20 move to config file
- */
- timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20);
+ if (ntohs (message->size) < sizeof (struct GNUNET_GNS_ClientLookupMessage))
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
- GNUNET_CRYPTO_hash(name, strlen(name), &name_hash);
- GNUNET_CRYPTO_hash_xor(&zone_hash, &name_hash, &xor_hash);
- GNUNET_DHT_put (dht_handle, &xor_hash,
- 5, //replication level
- GNUNET_DHT_RO_NONE,
- GNUNET_BLOCK_TYPE_TEST, //FIXME todo block plugin
- (data_ptr-data),
- data,
- expiration, //FIXME from record makes sense? is absolute?
- timeout,
- NULL, //FIXME continuation needed? success check? yes ofc
- NULL); //cls for cont
+ GNUNET_SERVER_notification_context_add (nc, client);
- /**
- * Reschedule periodic put
- */
- GNUNET_SCHEDULER_add_delayed (dht_update_interval,
- &update_zone_dht,
- NULL);
+ struct GNUNET_GNS_ClientLookupMessage *sh_msg =
+ (struct GNUNET_GNS_ClientLookupMessage *) message;
+
+ msg_size = ntohs(message->size);
+ if (msg_size > GNUNET_SERVER_MAX_MESSAGE_SIZE)
+ {
+ GNUNET_break_op (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ return;
+ }
+
+ GNUNET_STRINGS_utf8_tolower((char*)&sh_msg[1], &nameptr);
+ namelen = strlen(name)+1;
+ clh = GNUNET_malloc(sizeof(struct ClientLookupHandle));
+ clh->client = client;
+ clh->name = GNUNET_malloc(namelen);
+ strcpy(clh->name, name);
+ clh->unique_id = sh_msg->id;
+ clh->type = ntohl(sh_msg->type);
+
+ if (GNUNET_YES == auto_import_pkey)
+ {
+ gns_resolver_lookup_record(zone_hash, clh->type, name,
+ zone_key,
+ default_lookup_timeout,
+ &send_lookup_response, clh);
+ }
+ else
+ {
+ gns_resolver_lookup_record(zone_hash, clh->type, name,
+ NULL,
+ default_lookup_timeout,
+ &send_lookup_response, clh);
+ }
}
-/**
- * Periodically iterate over our zone and store everything in dht
- *
- * @param cls NULL
- * @param tc task context
- */
-static void
-update_zone_dht(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Update zone!\n");
- GNUNET_NAMESTORE_zone_transfer (namestore_handle, &zone_hash,
- &put_gns_record,
- NULL);
-}
+
/**
* Process GNS requests.
*
- * @param cls closure
+ * @param cls closure)
* @param server the initialized server
* @param c configuration to use
*/
const struct GNUNET_CONFIGURATION_Handle *c)
{
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Init GNS\n");
- zone_key = GNUNET_CRYPTO_rsa_key_create ();
-
- GNUNET_CRYPTO_hash(zone_key, GNUNET_CRYPTO_RSA_KEY_LENGTH,//FIXME is this ok?
- &zone_hash);
- nc = GNUNET_SERVER_notification_context_create (server, 1);
-
- /* FIXME - do some config parsing
- * - Maybe only hijack dns if option is set (HIJACK_DNS=1)
- */
-
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
- NULL);
- /**
- * Do gnunet dns init here
- */
- dns_handle = GNUNET_DNS_connect(c,
- GNUNET_DNS_FLAG_PRE_RESOLUTION,
- &handle_dns_request, /* rh */
- NULL); /* Closure */
-
- if (NULL == dns_handle)
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Initializing GNS\n");
+
+ char* keyfile;
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
+ unsigned long long max_parallel_bg_queries = 0;
+ unsigned long long default_lookup_timeout_secs = 0;
+ int ignore_pending = GNUNET_NO;
+
+ static const struct GNUNET_SERVER_MessageHandler handlers[] = {
+ {&handle_shorten, NULL, GNUNET_MESSAGE_TYPE_GNS_SHORTEN, 0},
+ {&handle_lookup, NULL, GNUNET_MESSAGE_TYPE_GNS_LOOKUP, 0},
+ {&handle_get_authority, NULL, GNUNET_MESSAGE_TYPE_GNS_GET_AUTH, 0}
+ };
+
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (c, "gns",
+ "ZONEKEY", &keyfile))
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Failed to connect to the dnsservice!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "No private key for root zone specified!\n");
+ GNUNET_SCHEDULER_shutdown(0);
+ return;
}
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Using keyfile %s for root zone.\n", keyfile);
+
+ zone_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+ GNUNET_CRYPTO_rsa_key_get_public (zone_key, &pkey);
+
+ GNUNET_CRYPTO_short_hash(&pkey,
+ sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ &zone_hash);
+ GNUNET_free(keyfile);
+
/**
* handle to our local namestore
*/
//FIXME do error handling;
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
"Failed to connect to the namestore!\n");
+ GNUNET_SCHEDULER_shutdown(0);
+ return;
+ }
+
+
+
+ auto_import_pkey = GNUNET_NO;
+
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (c, "gns",
+ "AUTO_IMPORT_PKEY"))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Automatic PKEY import is enabled.\n");
+ auto_import_pkey = GNUNET_YES;
+
}
+ dht_max_update_interval = GNUNET_GNS_DHT_MAX_UPDATE_INTERVAL;
+
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number (c, "gns",
+ "DHT_MAX_UPDATE_INTERVAL",
+ &dht_max_update_interval))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "DHT zone update interval: %d\n",
+ dht_max_update_interval);
+ }
+
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number (c, "gns",
+ "MAX_PARALLEL_BACKGROUND_QUERIES",
+ &max_parallel_bg_queries))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Number of allowed parallel background queries: %d\n",
+ max_parallel_bg_queries);
+ }
+
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (c, "gns",
+ "AUTO_IMPORT_CONFIRMATION_REQ"))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Auto import requires user confirmation\n");
+ ignore_pending = GNUNET_YES;
+ }
+
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number(c, "gns",
+ "DEFAULT_LOOKUP_TIMEOUT",
+ &default_lookup_timeout_secs))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Default lookup timeout: %ds\n", default_lookup_timeout_secs);
+ default_lookup_timeout = GNUNET_TIME_relative_multiply(
+ GNUNET_TIME_UNIT_SECONDS,
+ default_lookup_timeout_secs);
+ }
+
/**
* handle to the dht
*/
- dht_handle = GNUNET_DHT_connect(c, 1); //FIXME get ht_len from cfg
+ dht_handle = GNUNET_DHT_connect(c,
+ //max_parallel_bg_queries); //FIXME get ht_len from cfg
+ 1024);
if (NULL == dht_handle)
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Could not connect to DHT!\n");
}
+
+ if (gns_resolver_init(namestore_handle, dht_handle, zone_hash,
+ max_parallel_bg_queries,
+ ignore_pending)
+ == GNUNET_SYSERR)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ "Unable to initialize resolver!\n");
+ GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ return;
+ }
+
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (c, "gns", "HIJACK_DNS"))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "DNS hijacking enabled... connecting to service.\n");
- put_some_records(); //FIXME for testing
+ if (gns_interceptor_init(zone_hash, zone_key, c) == GNUNET_SYSERR)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ "Failed to enable the dns interceptor!\n");
+ }
+ }
/**
* Schedule periodic put
* for our records
+ * We have roughly an hour for all records;
*/
dht_update_interval = GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS,
- 60); //FIXME from cfg
- GNUNET_SCHEDULER_add_delayed (dht_update_interval,
- &update_zone_dht,
- NULL);
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "GNS Init done!\n");
+ 1);
+ zone_update_taskid = GNUNET_SCHEDULER_add_now (&update_zone_dht_start, NULL);
+
+ GNUNET_SERVER_add_handlers (server, handlers);
+
+ //FIXME
+ //GNUNET_SERVER_disconnect_notify (server,
+ // &client_disconnect_notification,
+ // NULL);
+
+ nc = GNUNET_SERVER_notification_context_create (server, 1);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
+ NULL);
}
projects / oweals / gnunet.git / blobdiff