#include "gnunet_dht_service.h"
-/** FIXME: by default I keep current_source, and destination as my own id.
- * in case we find a finger then we update current_source in the
- * find_successor message.
- * Construct a Put message and send it to target_peer.
- * @param key Key for the content
- * @param data Content to store
- * @param data_size Size of content @a data in bytes
+/**
+ * Construct a Put message and send it to target_peer.
+ * @param key Key for the content
* @param block_type Type of the block
* @param options Routing options
* @param desired_replication_level Desired replication count
- * @param expiration_time When does the content expire
- * @param current_destination
- * @param current_source
+ * @param best_known_dest Peer to which this message should reach eventually,
+ * as it is best known destination to me.
+ * @param intermediate_trail_id Trail id in case
* @param target_peer Peer to which this message will be forwarded.
* @param hop_count Number of hops traversed so far.
* @param put_path_length Total number of peers in @a put_path
- * @param put_path Number of peers traversed so far
+ * @param put_path Number of peers traversed so far
+ * @param expiration_time When does the content expire
+ * @param data Content to store
+ * @param data_size Size of content @a data in bytes
*/
void
GDS_NEIGHBOURS_send_put (const struct GNUNET_HashCode *key,
- const void *data, size_t data_size,
enum GNUNET_BLOCK_Type block_type,
- enum GNUNET_DHT_RouteOption options,
- uint32_t desired_replication_level,
- struct GNUNET_TIME_Absolute expiration_time,
- struct GNUNET_PeerIdentity current_destination,
- struct GNUNET_PeerIdentity current_source,
- struct GNUNET_PeerIdentity *target_peer,
+ enum GNUNET_DHT_RouteOption options,
+ uint32_t desired_replication_level,
+ struct GNUNET_PeerIdentity *best_known_dest,
+ struct GNUNET_HashCode *intermediate_trail_id,
+ struct GNUNET_PeerIdentity *target_peer,
uint32_t hop_count,
uint32_t put_path_length,
- struct GNUNET_PeerIdentity *put_path);
+ struct GNUNET_PeerIdentity *put_path,
+ struct GNUNET_TIME_Absolute expiration_time,
+ const void *data, size_t data_size);
-/** FIXME: by default I keep current_source, and destination as my own id.
- * in case we find a finger then we update current_source in the
- * find_successor message.
- * Construct a Get message and send it to target_peer.
- * @param key Key for the content
- * @param data Content to store
- * @param data_size Size of content @a data in bytes
+/**
+ * Construct a Get message and send it to target_peer.
+ * @param key Key for the content
* @param block_type Type of the block
* @param options Routing options
* @param desired_replication_level Desired replication count
- * @param expiration_time When does the content expire
- * @param current_destination
- * @param current_source
+ * @param best_known_dest
+ * @param intermediate_trail_id
* @param target_peer Peer to which this message will be forwarded.
* @param hop_count Number of hops traversed so far.
- * @param put_path_length Total number of peers in @a put_path
- * @param put_path Number of peers traversed so far
+ * @param data Content to store
+ * @param data_size Size of content @a data in bytes
+ * @param get_path_length Total number of peers in @a get_path
+ * @param get_path Number of peers traversed so far
*/
void
GDS_NEIGHBOURS_send_get (const struct GNUNET_HashCode *key,
enum GNUNET_BLOCK_Type block_type,
enum GNUNET_DHT_RouteOption options,
uint32_t desired_replication_level,
- struct GNUNET_PeerIdentity current_destination,
- struct GNUNET_PeerIdentity current_source,
+ struct GNUNET_PeerIdentity *best_known_dest,
+ struct GNUNET_HashCode *intermediate_trail_id,
struct GNUNET_PeerIdentity *target_peer,
uint32_t hop_count,
uint32_t get_path_length,
/**
* Send the get result to requesting client.
- * @param expiration When will this result expire?
* @param key Key of the requested data.
+ * @param type Block type
+ * @param target_peer Next peer to forward the message to.
+ * @param source_peer Peer which has the data for the key.
* @param put_path_length Number of peers in @a put_path
* @param put_path Path taken to put the data at its stored location.
- * @param type Block type
- * @param data_size Size of the @a data
- * @param data Payload to store
- * @param get_path Path taken to reach to the location of the key.
* @param get_path_length Number of peers in @a get_path
- * @param current_get_path_index Index in get_path
- * @param next_hop Next peer to forward the message to.
- * @param source_peer Peer which has the data for the key.
+ * @param get_path Path taken to reach to the location of the key.
+ * @param expiration When will this result expire?
+ * @param data Payload to store
+ * @param data_size Size of the @a data
*/
-/* FIXME: Remove redundant arguments
- * 1.remove get_path_index from message and just look up into the get path
- for your location and get the next peer.
- * 2. Remove next_hop, source_peer */
void
-GDS_NEIGHBOURS_send_get_result (struct GNUNET_TIME_Absolute expiration,
- const struct GNUNET_HashCode *key,
+GDS_NEIGHBOURS_send_get_result (const struct GNUNET_HashCode *key,
+ enum GNUNET_BLOCK_Type type,
+ struct GNUNET_PeerIdentity *target_peer,
+ struct GNUNET_PeerIdentity *source_peer,
unsigned int put_path_length,
const struct GNUNET_PeerIdentity *put_path,
- enum GNUNET_BLOCK_Type type, size_t data_size,
- const void *data,
- struct GNUNET_PeerIdentity *get_path,
unsigned int get_path_length,
- struct GNUNET_PeerIdentity *next_hop,
- struct GNUNET_PeerIdentity *source_peer);
+ struct GNUNET_PeerIdentity *get_path,
+ struct GNUNET_TIME_Absolute expiration,
+ const void *data, size_t data_size);
/**
* Initialize neighbours subsystem.
projects / oweals / gnunet.git / blobdiff