/*
This file is part of GNUnet.
- (C) 2001, 2002, 2003, 2004, 2009 Christian Grothoff (and other contributing authors)
+ (C) 2001, 2002, 2003, 2004, 2009, 2011 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
* @file dht/dht.h
*/
-#ifndef DHT_H_
-#define DHT_H_
+#ifndef DHT_H
+#define DHT_H
-#define DEBUG_DHT GNUNET_NO
-#define DEBUG_DHT_ROUTING GNUNET_YES
-
-#define DHT_BLOOM_SIZE 16
-
-#define DHT_BLOOM_K 8
-
-#define MAX_OUTSTANDING_FORWARDS 100
-
-#define DHT_FORWARD_TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5)
-
-#define DHT_SEND_PRIORITY 4
+/**
+ * Size of the bloom filter the DHT uses to filter peers.
+ */
+#define DHT_BLOOM_SIZE 128
-typedef void (*GNUNET_DHT_MessageReceivedHandler) (void *cls,
- const struct GNUNET_MessageHeader
- *msg);
/**
* Message which indicates the DHT should cancel outstanding
* requests and discard any state.
*/
-struct GNUNET_DHT_StopMessage
+struct GNUNET_DHT_ClientGetStopMessage
{
/**
- * Type: GNUNET_MESSAGE_TYPE_DHT_STOP
+ * Type: GNUNET_MESSAGE_TYPE_DHT_GET_STOP
*/
struct GNUNET_MessageHeader header;
/**
- * Generic DHT message, indicates that a route request
- * should be issued, if coming from a client. Shared
- * usage for api->server and P2P message passing.
+ * DHT GET message sent from clients to service. Indicates that a GET
+ * request should be issued.
*/
-struct GNUNET_DHT_RouteMessage
+struct GNUNET_DHT_ClientGetMessage
{
/**
- * Type: GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE
+ * Type: GNUNET_MESSAGE_TYPE_DHT_CLIENT_GET
*/
struct GNUNET_MessageHeader header;
/**
- * Message options
+ * Message options, actually an 'enum GNUNET_DHT_RouteOption' value.
*/
uint32_t options GNUNET_PACKED;
- /**
- * The key to search for
- */
- GNUNET_HashCode key;
-
- /**
- * Unique ID identifying this request, if 0 then
- * the client will not expect a response
- */
- uint64_t unique_id GNUNET_PACKED;
-
/**
* Replication level for this message
*/
uint32_t desired_replication_level GNUNET_PACKED;
-
- /* GNUNET_MessageHeader *enc actual DHT message, copied to end of this dealy do */
-
-};
-
-/**
- * Generic local route result message
- */
-struct GNUNET_DHT_RouteResultMessage
-{
/**
- * Type: GNUNET_MESSAGE_TYPE_DHT_LOCAL_ROUTE_RESULT
+ * The type for the data for the GET request; actually an 'enum
+ * GNUNET_BLOCK_Type'.
*/
- struct GNUNET_MessageHeader header;
+ uint32_t type;
/**
- * Message options
+ * The key to search for
*/
- uint32_t options GNUNET_PACKED;
+ GNUNET_HashCode key;
/**
- * Unique ID identifying this request (necessary for
- * client to compare to sent requests)
+ * Unique ID identifying this request, if 0 then
+ * the client will not expect a response
*/
uint64_t unique_id GNUNET_PACKED;
- /**
- * The key that was searched for
- */
- GNUNET_HashCode key;
+ /* Possibly followed by xquery, copied to end of this dealy do */
- /* GNUNET_MessageHeader *enc actual DHT message, copied to end of this dealy do */
};
+
/**
- * Generic P2P DHT route message
+ * Reply to a GET send from the service to a client.
*/
-struct GNUNET_DHT_P2PRouteMessage
+struct GNUNET_DHT_ClientResultMessage
{
/**
- * Type: GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE
+ * Type: GNUNET_MESSAGE_TYPE_DHT_CLIENT_RESULT
*/
struct GNUNET_MessageHeader header;
/**
- * Message options
- */
- uint32_t options GNUNET_PACKED;
-
- /**
- * Hop count
+ * The type for the data.
*/
- uint32_t hop_count GNUNET_PACKED;
+ uint32_t type;
/**
- * Network size estimate
+ * Number of peers recorded in the outgoing path from source to the
+ * storgage location of this message.
*/
- uint32_t network_size GNUNET_PACKED;
+ uint32_t put_path_length GNUNET_PACKED;
/**
- * Replication level for this message
+ * The number of peer identities recorded from the storage location
+ * to this peer.
*/
- uint32_t desired_replication_level GNUNET_PACKED;
+ uint32_t get_path_length GNUNET_PACKED;
/**
- * Unique ID identifying this request
+ * Unique ID of the matching GET request.
*/
uint64_t unique_id GNUNET_PACKED;
- /*
- * Bloomfilter to stop circular routes
- */
- char bloomfilter[DHT_BLOOM_SIZE];
-
/**
- * FIXME: add DHT logging for analysis!
- */
-#if LOG_SQL
- /*
- * Unique query id for sql database interaction.
- */
- uint64_t queryuid;
-
- /*
- * Unique trial id for sql database interaction
- */
- uint64_t trialuid;
-
-#endif
-
- /**
- * The key to search for
- */
- GNUNET_HashCode key;
-
- /* GNUNET_MessageHeader *enc actual DHT message, copied to end of this dealy do */
-
-};
-
-/**
- * Generic P2P route result
- *
- * FIXME: One question is how much to include for a route result message.
- * Assuming a peer receives such a message, but has no record of a
- * route message, what should it do? It can either drop the message
- * or try to forward it towards the original peer... However, for
- * that to work we would need to include the original peer identity
- * in the GET request, which adds more data to the message.
- */
-struct GNUNET_DHT_P2PRouteResultMessage
-{
- /**
- * Type: GNUNET_MESSAGE_TYPE_DHT_P2P_ROUTE_RESULT
- */
- struct GNUNET_MessageHeader header;
-
- /**
- * Message options
- */
- uint32_t options GNUNET_PACKED;
-
- /**
- * Hop count
- */
- uint32_t hop_count GNUNET_PACKED;
-
- /**
- * Unique ID identifying this request (may not be set)
- */
- uint64_t unique_id GNUNET_PACKED;
-
- /*
- * Bloomfilter to stop circular routes
+ * When does this entry expire?
*/
- char bloomfilter[DHT_BLOOM_SIZE];
+ struct GNUNET_TIME_AbsoluteNBO expiration;
/**
* The key that was searched for
*/
GNUNET_HashCode key;
-#if FORWARD_UNKNOWN
- /**
- * Network size estimate
- */
- uint32_t network_size GNUNET_PACKED;
-#endif
+ /* put path, get path and actual data are copied to end of this dealy do */
- /* GNUNET_MessageHeader *enc actual DHT message, copied to end of this dealy do */
};
/**
- * Message to insert data into the DHT, shared
- * between api->server communication and P2P communication.
- * The type must be different for the two purposes.
+ * Message to insert data into the DHT, sent from clients to DHT service.
*/
-struct GNUNET_DHT_PutMessage
+struct GNUNET_DHT_ClientPutMessage
{
/**
- * Type: GNUNET_MESSAGE_TYPE_DHT_PUT / GNUNET_MESSAGE_TYPE_DHT_P2P_PUT
+ * Type: GNUNET_MESSAGE_TYPE_DHT_CLIENT_PUT
*/
struct GNUNET_MessageHeader header;
/**
* The type of data to insert.
*/
- size_t type GNUNET_PACKED;
+ uint32_t type GNUNET_PACKED;
/**
- * How long should this data persist?
+ * Message options, actually an 'enum GNUNET_DHT_RouteOption' value.
*/
- struct GNUNET_TIME_AbsoluteNBO expiration;
-
- /**
- * The size of the data, appended to the end of this message.
- */
- size_t data_size GNUNET_PACKED;
-
-};
-
-
-/**
- * Message to request data from the DHT, shared
- * between P2P requests and local get requests.
- * Main difference is that if the request comes in
- * locally we need to remember it (for client response).
- */
-struct GNUNET_DHT_GetMessage
-{
- /**
- * Type: GNUNET_MESSAGE_TYPE_DHT_GET / GNUNET_MESSAGE_TYPE_DHT_P2P_GET
- */
- struct GNUNET_MessageHeader header;
-
- /**
- * The type for the data for the GET request
- */
- uint32_t type;
-
-};
+ uint32_t options GNUNET_PACKED;
-/**
- * Message to return data either to the client API
- * or to respond to a request received from another
- * peer. Shared format, different types.
- */
-struct GNUNET_DHT_GetResultMessage
-{
/**
- * Type: GNUNET_MESSAGE_TYPE_DHT_GET_RESULT / GNUNET_MESSAGE_TYPE_DHT_P2P_GET_RESULT
+ * Replication level for this message
*/
- struct GNUNET_MessageHeader header;
+ uint32_t desired_replication_level GNUNET_PACKED;
/**
- * The type for the data for the GET request
+ * How long should this data persist?
*/
- uint32_t type;
+ struct GNUNET_TIME_AbsoluteNBO expiration;
/**
- * The key that was searched for
+ * The key to store the value under.
*/
- //GNUNET_HashCode key;
+ GNUNET_HashCode key;
- /**
- * When does this entry expire?
- */
- struct GNUNET_TIME_AbsoluteNBO expiration;
+ /* DATA copied to end of this message */
};
-#endif /* DHT_H_ */
+#endif