/*
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
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
* @file dht/dht.h
*/
-#ifndef DHT_H_
-#define DHT_H_
+#ifndef DHT_H
+#define DHT_H
-#define DEBUG_DHT GNUNET_YES
-typedef void (*GNUNET_DHT_MessageReceivedHandler) (void *cls,
- struct GNUNET_MessageHeader *msg);
+/**
+ * Size of the bloom filter the DHT uses to filter peers.
+ */
+#define DHT_BLOOM_SIZE 128
+
+
+GNUNET_NETWORK_STRUCT_BEGIN
/**
- * Generic DHT message, wrapper for other message types
+ * Message which indicates the DHT should cancel outstanding
+ * requests and discard any state.
*/
-struct GNUNET_DHT_Message
+struct GNUNET_DHT_ClientGetStopMessage
{
/**
- * Type: GNUNET_MESSAGE_TYPE_DHT_MESSAGE
+ * Type: #GNUNET_MESSAGE_TYPE_DHT_CLIENT_GET_STOP
*/
struct GNUNET_MessageHeader header;
/**
- * The key to search for
+ * Always zero.
+ */
+ uint32_t reserved GNUNET_PACKED;
+
+ /**
+ * Unique ID identifying this request
+ */
+ uint64_t unique_id GNUNET_PACKED;
+
+ /**
+ * Key of this request
+ */
+ struct GNUNET_HashCode key;
+
+};
+
+
+/**
+ * DHT GET message sent from clients to service. Indicates that a GET
+ * request should be issued.
+ */
+struct GNUNET_DHT_ClientGetMessage
+{
+ /**
+ * Type: #GNUNET_MESSAGE_TYPE_DHT_CLIENT_GET
+ */
+ struct GNUNET_MessageHeader header;
+
+ /**
+ * Message options, actually an 'enum GNUNET_DHT_RouteOption' value.
*/
- GNUNET_HashCode key;
+ uint32_t options GNUNET_PACKED;
/**
* Replication level for this message
*/
- uint16_t desired_replication_level;
+ uint32_t desired_replication_level GNUNET_PACKED;
+
+ /**
+ * The type for the data for the GET request; actually an 'enum
+ * GNUNET_BLOCK_Type'.
+ */
+ uint32_t type GNUNET_PACKED;
+
+ /**
+ * The key to search for
+ */
+ struct GNUNET_HashCode key GNUNET_PACKED;
+
+ /**
+ * Unique ID identifying this request, if 0 then
+ * the client will not expect a response
+ */
+ uint64_t unique_id GNUNET_PACKED;
+
+ /* Possibly followed by xquery, copied to end of this dealy do */
+
+};
+
+
+/**
+ * DHT GET RESULTS KNOWN message sent from clients to service. Indicates that a GET
+ * request should exclude certain results which are already known.
+ */
+struct GNUNET_DHT_ClientGetResultSeenMessage
+{
+ /**
+ * Type: #GNUNET_MESSAGE_TYPE_DHT_CLIENT_GET_RESULTS_KNOWN
+ */
+ struct GNUNET_MessageHeader header;
+
+ /**
+ * Reserved, always 0.
+ */
+ uint32_t reserved GNUNET_PACKED;
+
+ /**
+ * The key we are searching for (to make it easy to find the corresponding
+ * GET inside the service).
+ */
+ struct GNUNET_HashCode key GNUNET_PACKED;
+
+ /**
+ * Unique ID identifying this request.
+ */
+ uint64_t unique_id GNUNET_PACKED;
+
+ /* Followed by an array of the hash codes of known results */
+
+};
+
+
+
+/**
+ * Reply to a GET send from the service to a client.
+ */
+struct GNUNET_DHT_ClientResultMessage
+{
+ /**
+ * Type: #GNUNET_MESSAGE_TYPE_DHT_CLIENT_RESULT
+ */
+ struct GNUNET_MessageHeader header;
+
+ /**
+ * The type for the data.
+ */
+ uint32_t type GNUNET_PACKED;
/**
- * Message options
+ * Number of peers recorded in the outgoing path from source to the
+ * storgage location of this message.
*/
- uint16_t options;
+ uint32_t put_path_length GNUNET_PACKED;
/**
- * Is this message uniquely identified? If so it has
- * a unique_id appended to it.
+ * The number of peer identities recorded from the storage location
+ * to this peer.
*/
- /* uint16_t unique; I don't think we need this, it should be held in the encapsulated message */
+ uint32_t get_path_length GNUNET_PACKED;
- /* uint64_t unique_id*/
- /* */
- /* GNUNET_MessageHeader *enc actual DHT message, copied to end of this dealy do */
+ /**
+ * Unique ID of the matching GET request.
+ */
+ uint64_t unique_id GNUNET_PACKED;
+
+ /**
+ * When does this entry expire?
+ */
+ struct GNUNET_TIME_AbsoluteNBO expiration;
+
+ /**
+ * The key that was searched for
+ */
+ struct GNUNET_HashCode key GNUNET_PACKED;
+
+ /* put path, get path and actual data are copied to end of this dealy do */
};
+
/**
- * Message to insert data into the DHT
+ * 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
+ * Type: #GNUNET_MESSAGE_TYPE_DHT_CLIENT_PUT
*/
struct GNUNET_MessageHeader header;
/**
* The type of data to insert.
*/
- size_t type;
+ uint32_t type GNUNET_PACKED;
+
+ /**
+ * Message options, actually an 'enum GNUNET_DHT_RouteOption' value.
+ */
+ uint32_t options GNUNET_PACKED;
+
+ /**
+ * Replication level for this message
+ */
+ uint32_t desired_replication_level GNUNET_PACKED;
/**
- * The size of the data, appended to the end of this message.
+ * Unique ID for the PUT message.
*/
- size_t data_size;
+ uint64_t unique_id GNUNET_PACKED;
/**
* How long should this data persist?
*/
- struct GNUNET_TIME_Absolute expiration;
+ struct GNUNET_TIME_AbsoluteNBO expiration;
+
+ /**
+ * The key to store the value under.
+ */
+ struct GNUNET_HashCode key GNUNET_PACKED;
+
+ /* DATA copied to end of this message */
};
/**
- * Message to request data from the DHT
+ * Message to confirming receipt of PUT, sent from DHT service to clients.
*/
-struct GNUNET_DHT_GetMessage
+struct GNUNET_DHT_ClientPutConfirmationMessage
{
/**
- * Type: GNUNET_MESSAGE_TYPE_DHT_GET
+ * Type: #GNUNET_MESSAGE_TYPE_DHT_CLIENT_PUT_OK
*/
struct GNUNET_MessageHeader header;
/**
- * The type for the data for the GET request
+ * Always zero.
*/
- size_t type;
+ uint32_t reserved GNUNET_PACKED;
/**
- * The key to search for
+ * Unique ID from the PUT message that is being confirmed.
*/
- GNUNET_HashCode key;
+ uint64_t unique_id GNUNET_PACKED;
};
+
+
/**
- * Message to return data from the DHT
+ * Message to monitor put requests going through peer, DHT service -> clients.
*/
-struct GNUNET_DHT_GetResultMessage
+struct GNUNET_DHT_MonitorPutMessage
{
/**
- * Type: GNUNET_MESSAGE_TYPE_DHT_GET_RESULT
+ * Type: #GNUNET_MESSAGE_TYPE_DHT_MONITOR_PUT
*/
struct GNUNET_MessageHeader header;
/**
- * The type for the data for the GET request
+ * Message options, actually an 'enum GNUNET_DHT_RouteOption' value.
*/
- size_t type;
+ uint32_t options GNUNET_PACKED;
/**
- * The key to search for
+ * The type of data in the request.
+ */
+ uint32_t type GNUNET_PACKED;
+
+ /**
+ * Hop count so far.
+ */
+ uint32_t hop_count GNUNET_PACKED;
+
+ /**
+ * Replication level for this message
+ */
+ uint32_t desired_replication_level GNUNET_PACKED;
+
+ /**
+ * Number of peers recorded in the outgoing path from source to the
+ * storage location of this message.
+ */
+ uint32_t put_path_length GNUNET_PACKED;
+
+ /**
+ * How long should this data persist?
+ */
+ struct GNUNET_TIME_AbsoluteNBO expiration_time;
+
+ /**
+ * The key to store the value under.
+ */
+ struct GNUNET_HashCode key GNUNET_PACKED;
+
+ /* put path (if tracked) */
+
+ /* Payload */
+
+};
+
+
+/**
+ * Message to request monitoring messages, clients -> DHT service.
+ */
+struct GNUNET_DHT_MonitorStartStopMessage
+{
+ /**
+ * Type: #GNUNET_MESSAGE_TYPE_DHT_MONITOR_START or
+ * #GNUNET_MESSAGE_TYPE_DHT_MONITOR_STOP
+ */
+ struct GNUNET_MessageHeader header;
+
+ /**
+ * The type of data desired, GNUNET_BLOCK_TYPE_ANY for all.
*/
- GNUNET_HashCode key;
+ uint32_t type GNUNET_PACKED;
/**
- * The size of the data, appended to the end of this message.
+ * Flag whether to notify about GET messages.
*/
- size_t data_size;
+ int16_t get GNUNET_PACKED;
+ /**
+ * Flag whether to notify about GET_REPONSE messages.
+ */
+ int16_t get_resp GNUNET_PACKED;
+
+ /**
+ * Flag whether to notify about PUT messages.
+ */
+ int16_t put GNUNET_PACKED;
+
+ /**
+ * Flag whether to use the provided key to filter messages.
+ */
+ int16_t filter_key GNUNET_PACKED;
+
+ /**
+ * The key to filter messages by.
+ */
+ struct GNUNET_HashCode key GNUNET_PACKED;
};
+
/**
- * Message to request data from the DHT
+ * Message to monitor get requests going through peer, DHT service -> clients.
*/
-struct GNUNET_DHT_FindPeerMessage
+struct GNUNET_DHT_MonitorGetMessage
{
/**
- * Type: GNUNET_MESSAGE_TYPE_DHT_FIND_PEER
+ * Type: #GNUNET_MESSAGE_TYPE_DHT_MONITOR_GET
*/
struct GNUNET_MessageHeader header;
/**
- * The key being looked up
+ * Message options, actually an 'enum GNUNET_DHT_RouteOption' value.
+ */
+ uint32_t options GNUNET_PACKED;
+
+ /**
+ * The type of data in the request.
+ */
+ uint32_t type GNUNET_PACKED;
+
+ /**
+ * Hop count
+ */
+ uint32_t hop_count GNUNET_PACKED;
+
+ /**
+ * Replication level for this message
+ */
+ uint32_t desired_replication_level GNUNET_PACKED;
+
+ /**
+ * Number of peers recorded in the outgoing path from source to the
+ * storage location of this message.
*/
- GNUNET_HashCode key;
+ uint32_t get_path_length GNUNET_PACKED;
+
+ /**
+ * The key to store the value under.
+ */
+ struct GNUNET_HashCode key GNUNET_PACKED;
+
+ /* get path (if tracked) */
};
/**
- * Message to return data from the DHT
+ * Message to monitor get results going through peer, DHT service -> clients.
*/
-struct GNUNET_DHT_FindPeerResultMessage
+struct GNUNET_DHT_MonitorGetRespMessage
{
/**
- * Type: GNUNET_MESSAGE_TYPE_DHT_FIND_PEER_RESULT
+ * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_RESULT
*/
struct GNUNET_MessageHeader header;
/**
- * The peer that was searched for
+ * Content type.
+ */
+ uint32_t type GNUNET_PACKED;
+
+ /**
+ * Length of the PUT path that follows (if tracked).
*/
- struct GNUNET_PeerIdentity peer;
+ uint32_t put_path_length GNUNET_PACKED;
/**
- * The size of the HELLO for the returned peer,
- * appended to the end of this message, 0 if
- * no hello.
+ * Length of the GET path that follows (if tracked).
*/
- size_t data_size;
+ uint32_t get_path_length GNUNET_PACKED;
+
+ /**
+ * When does the content expire?
+ */
+ struct GNUNET_TIME_AbsoluteNBO expiration_time;
+
+ /**
+ * The key of the corresponding GET request.
+ */
+ struct GNUNET_HashCode key GNUNET_PACKED;
+
+ /* put path (if tracked) */
+
+ /* get path (if tracked) */
+
+ /* Payload */
};
-#endif /* DHT_H_ */
+GNUNET_NETWORK_STRUCT_END
+
+#endif