#include <fenv.h>
#include "dht.h"
-/* TODO:
- 1. to randomly choose one of the routes in case there are multiple
- routes to reach to the finger.
- 3. Structure alignment.
- 5. In put, we don't have anything like put result. so we are not adding anything
- in the routing table.
-*/
-
/**
* Maximum possible fingers of a peer.
*/
-#define MAX_FINGERS 66
+#define MAX_FINGERS 65
/**
* Maximum allowed number of pending messages per friend peer.
/**
* How long at most to wait for transmission of a request to another peer?
*/
-#define GET_TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 2)
+#define GET_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2)
+
+/**
+ * How long will I remain congested?
+ */
+#define CONGESTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2)
+
+/**
+ * Maximum number of trails stored per finger.
+ */
+#define MAXIMUM_TRAILS_PER_FINGER 2
+
+/**
+ * Used to distinguish put/get request use of find_successor() from others
+ */
+#define PUT_GET_REQUEST 65
+
+/**
+ * Maximum number of trails that can go through a friend.
+ */
+#define TRAIL_THROUGH_FRIEND_THRESHOLD 64
+
+/**
+ * Finger map index for predecessor entry in finger peermap.
+ */
+#define PREDECESSOR_FINGER_ID 64
+
+/**
+ * Maximum number of trails allowed to go through a friend.
+ */
+#define TRAILS_THROUGH_FRIEND_THRESHOLD 64
+
+/**
+ * Wrap around in peer identity circle.
+ */
+#define PEER_IDENTITES_WRAP_AROUND pow(2, 256) - 1
GNUNET_NETWORK_STRUCT_BEGIN
-
+
/**
- * P2P PUT message
+ * P2P Trail setup message
*/
-struct PeerPutMessage
+struct PeerTrailSetupMessage
{
/**
- * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_PUT
+ * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP
*/
struct GNUNET_MessageHeader header;
- /**
- * Processing options
- */
- uint32_t options GNUNET_PACKED;
+ /* Bitmask of options, 1 = IS_PREDECESSOR */
+ // int32_t options;
/**
- * Content type.
+ * Peer closest to this value will be our finger.
*/
- uint32_t block_type GNUNET_PACKED;
+ uint64_t ultimate_destination_finger;
/**
- * Hop count
+ * Source peer which wants to setup the trail to one of its finger.
*/
- uint32_t hop_count GNUNET_PACKED;
+ struct GNUNET_PeerIdentity source_peer;
/**
- * Replication level for this message
- * In the current implementation, this value is not used.
+ * Peer to which this packet is forwarded.
*/
- uint32_t desired_replication_level GNUNET_PACKED;
+ struct GNUNET_PeerIdentity next_destination; // rename "best_known_dest"
/**
- * Length of the PUT path that follows (if tracked).
- */
- uint32_t put_path_length GNUNET_PACKED;
-
- /**
- * Current destination to which this message is forwarded.
+ * Index into finger peer map, in Network Byte Order.
*/
- struct GNUNET_PeerIdentity current_destination;
-
+ uint32_t finger_map_index; // remove this, include ultimate_destination_finger in response, calculate index from it
+
/**
- * Peer whose finger is current_destination.
+ * Number of entries in trail_list, in Network Byte Order.
*/
- struct GNUNET_PeerIdentity current_source;
-
+ uint32_t trail_length GNUNET_PACKED; // remove this, calculte length from message size
+
/**
- * When does the content expire?
+ * Trail id of any intermediate trail we may encounter while doing trail setup.
*/
- struct GNUNET_TIME_AbsoluteNBO expiration_time;
-
+ struct GNUNET_HashCode intermediate_trail_id;
+
/**
- * The key to store the value under.
+ * Trail id for trail which we are trying to setup.
*/
- struct GNUNET_HashCode key GNUNET_PACKED;
-
- /* put path (if tracked) */
+ struct GNUNET_HashCode new_trail_id; // rename to "trail_id"
- /* Payload */
-
+ /* Trail formed in the process. */
+ /* GNUNET_PeerIdentity trail_list[] */
};
-
/**
- * P2P Result message
+ * P2P Trail Setup Result message
*/
-struct PeerGetResultMessage
+struct PeerTrailSetupResultMessage
{
+
/**
- * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_GET_RESULT
+ * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP_RESULT
*/
struct GNUNET_MessageHeader header;
/**
- * The type for the data.
- */
- uint32_t type GNUNET_PACKED;
-
- /**
- * Peer which will receive the get result message.
+ * Finger to which we have found the path.
*/
- struct GNUNET_PeerIdentity source_peer;
+ struct GNUNET_PeerIdentity finger_identity;
/**
- * Number of peers recorded in the outgoing path from source to the
- * stored location of this message.
+ * Peer which was looking for the trail to finger.
*/
- uint32_t put_path_length GNUNET_PACKED;
-
+ struct GNUNET_PeerIdentity destination_peer; // querying_peer
+
/**
- * Length of the GET path that follows (if tracked).
+ * Index into finger peer map in NBO.
*/
- uint32_t get_path_length GNUNET_PACKED;
+ uint32_t finger_map_index; // flag/option with IS_PREDECESSOR
/**
- * When does the content expire?
+ * Number of entries in trail list in NBO.
*/
- struct GNUNET_TIME_Absolute expiration_time;
+ uint32_t trail_length GNUNET_PACKED; // remove, calculate
/**
- * The key of the corresponding GET request.
+ * Identifier of the trail.
*/
- struct GNUNET_HashCode key;
-
- /* put path (if tracked) */
-
- /* get path (if tracked) */
-
- /* Payload */
+ struct GNUNET_HashCode trail_id;
+ /* Trail from "destination_peer" to finger_identity, NOT including both */
+ /* struct GNUNET_PeerIdentity trail[] */
};
-
/**
- * P2P GET message
+ * P2P Verify Successor Message.
*/
-struct PeerGetMessage
+struct PeerVerifySuccessorMessage
{
/**
- * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_GET
+ * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_VERIFY_SUCCESSOR
*/
struct GNUNET_MessageHeader header;
-
- /**
- * Processing options
- */
- uint32_t options GNUNET_PACKED;
/**
- * Desired content type.
- */
- uint32_t block_type GNUNET_PACKED;
-
- /**
- * Hop count
- */
- uint32_t hop_count GNUNET_PACKED;
-
- /**
- * Desired replication level for this request.
- * In the current implementation, this value is not used.
- */
- uint32_t desired_replication_level GNUNET_PACKED;
-
- /**
- * Total number of peers in get path.
+ * Source peer which wants to verify its successor.
*/
- unsigned int get_path_length;
-
+ struct GNUNET_PeerIdentity source_peer;
+
/**
- * Peer which is an intermediate destination.
+ * My current successor.
*/
- struct GNUNET_PeerIdentity current_destination;
-
+ struct GNUNET_PeerIdentity successor;
+
/**
- * Source for which current_destination is the finger.
+ * Identifier of trail to reach from source_peer to successor.
*/
- struct GNUNET_PeerIdentity current_source;
-
+ struct GNUNET_HashCode trail_id;
+
/**
- * The key we are looking for.
+ * Total number of peers to reach from source to successor.
*/
- struct GNUNET_HashCode key;
-
- /* Get path. */
+ unsigned int trail_length;
+ /* Trail. */
};
-
/**
- * P2P Trail setup message
+ * P2P Verify Successor Result Message
*/
-struct PeerTrailSetupMessage
+struct PeerVerifySuccessorResultMessage
{
-
/**
- * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP
+ * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_VERIFY_SUCCESSOR_RESULT
*/
struct GNUNET_MessageHeader header;
-
+
/**
- * Successor of this finger value will be our finger peer.
+ * Destination peer which sent the request to verify its successor.
*/
- uint64_t destination_finger;
+ struct GNUNET_PeerIdentity destination_peer;
/**
- * Source peer which wants to setup the trail to one of its finger.
+ * Successor to which PeerVerifySuccessorMessage was sent.
*/
- struct GNUNET_PeerIdentity source_peer;
-
+ struct GNUNET_PeerIdentity source_successor;
+
/**
- * Peer to which this packet is forwarded.
+ * source_successor's predecessor
*/
- struct GNUNET_PeerIdentity current_destination;
-
+ struct GNUNET_PeerIdentity my_predecessor;
+
/**
- * In case the packet is forwarded to an intermediate finger, then
- * current_source contains the peer id whose finger is the intermediate
- * finger. In case the packet is forwarded to a friend, then it is NULL.
- * FIXME: check the usage of current_source and fix this comment.
+ * Trail identifier of trail from my_predecessor to source_successor.
*/
- struct GNUNET_PeerIdentity current_source;
-
+ struct GNUNET_HashCode trail_id;
+
/**
- * Index into finger peer map, in Network Byte Order.
+ * Direction in which we are looking at the trail.
*/
- uint32_t finger_map_index;
-
+ enum GDS_ROUTING_trail_direction trail_direction;
+
/**
- * Number of entries in trail list, in Network Byte Order.
+ * Total number of peers in trail from source_successor to my_predecessor
+ * if my_predecessor is not same as destination_peer.
*/
- uint32_t trail_length GNUNET_PACKED;
-
- /* Trail formed in the process. */
-};
+ uint32_t trail_length;
+ /* Trail from source_successor to my_predecessor where
+ * my_predecessor != destination_peer*/
+};
/**
- * P2P Trail Setup Result message
+ * P2P Notify New Successor Message.
*/
-struct PeerTrailSetupResultMessage
+struct PeerNotifyNewSuccessorMessage
{
-
/**
- * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP_RESULT
+ * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_NOTIFY_NEW_SUCCESSOR
*/
struct GNUNET_MessageHeader header;
-
+
/**
- * Finger to which we have found the path.
+ * Source peer which wants to notify its new successor.
*/
- struct GNUNET_PeerIdentity finger_identity;
+ struct GNUNET_PeerIdentity source_peer;
/**
- * Peer which was looking for the trail to finger.
+ * New successor identity.
*/
struct GNUNET_PeerIdentity destination_peer;
-
+
/**
- * Index into finger peer map in NBO.
+ * Total number of peers in trail from source_peer to destination_peer
*/
- uint32_t finger_map_index;
-
+ unsigned int trail_length;
+
/**
- * Number of entries in trail list in NBO.
+ * Unique identifier of the trail.
*/
- uint32_t trail_length GNUNET_PACKED;
-
- /* Trail from destination_peer to finger_identity */
-
-};
+ struct GNUNET_HashCode trail_id;
+ /* Trail. */
+};
/**
- * P2P Trail Rejection Message.
+ * P2P Trail Compression Message.
*/
-struct PeerTrailRejectionMessage
+struct PeerTrailCompressionMessage
{
/**
- * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_REJECTION
+ * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_COMPRESSION
*/
struct GNUNET_MessageHeader header;
-
+
/**
- * Source peer which wants to set up the trail.
+ * Source peer of this trail.
*/
struct GNUNET_PeerIdentity source_peer;
-
- /**
- * Peer which sent trail rejection message.
- */
- struct GNUNET_PeerIdentity congested_peer;
-
+
/**
- * Peer identity which will be successor to this value will be finger of
- * source_peer.
+ * Destination of this trail.
*/
- uint64_t finger_identity_value;
-
+ struct GNUNET_PeerIdentity destination_peer;
+
/**
- * Index in finger peer map of source peer.
+ * Trail from source_peer to destination_peer compressed such that
+ * new_first_friend is the first hop in the trail from source to
+ * destination.
*/
- uint32_t finger_map_index;
-
+ struct GNUNET_PeerIdentity new_first_friend;
+
/**
- * Total number of peers in the trail.
+ * Unique identifier of trail.
*/
- uint32_t trail_length;
-
- /* Trail_list from source_peer to peer which sent the message for trail setup
- * to congested peer.*/
+ struct GNUNET_HashCode trail_id;
};
/**
- * P2P Verify Successor message.
+ * P2P Trail Tear Down message.
*/
-struct PeerVerifySuccessorMessage
+struct PeerTrailTearDownMessage
{
-
/**
- * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_VERIFY_SUCCESSOR
+ * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_TEARDOWN
*/
struct GNUNET_MessageHeader header;
-
+
/**
- * Source peer which wants to verify its successor.
+ * Source peer of the trail.
*/
struct GNUNET_PeerIdentity source_peer;
-
+
/**
- * My current successor.
+ * Destination peer of the trail.
*/
- struct GNUNET_PeerIdentity successor;
-
+ struct GNUNET_PeerIdentity destination_peer;
+
/**
- * Total number of peers in trail to current successor.
+ * Unique identifier of the trail.
*/
- uint32_t trail_length;
-
- /* Trail to reach to from source_peer to successor. */
+ struct GNUNET_HashCode TRAIL_ID;
+
+ /**
+ * Direction of trail.
+ */
+ enum GDS_ROUTING_trail_direction trail_direction;
};
/**
- * P2P Verify Successor Result message.
+ * P2P Trail Rejection Message.
*/
-struct PeerVerifySuccessorResultMessage
+struct PeerTrailRejectionMessage
{
-
/**
- * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_VERIFY_SUCCESSOR_RESULT
+ * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_REJECTION
*/
struct GNUNET_MessageHeader header;
-
- /**
- * Destination peer which sent the request to verify its successor.
- */
- struct GNUNET_PeerIdentity destination_peer;
-
+
/**
- * Successor to which PeerVerifySuccessorMessage was sent.
+ * Source peer which wants to set up the trail.
*/
- struct GNUNET_PeerIdentity source_successor;
-
+ struct GNUNET_PeerIdentity source_peer;
+
/**
- * source_successor's predecessor
+ * Peer which sent trail rejection message.
*/
- struct GNUNET_PeerIdentity my_predecessor;
-
+ struct GNUNET_PeerIdentity congested_peer;
+
/**
- * Total number of peers in trail.
+ * Peer identity which will be successor to this value will be finger of
+ * source_peer.
*/
- uint32_t trail_length;
-
- /* Trail to reach from destination_peer to its correct successor.
- * If source_successor is not destination peer, then trail is from destination_peer
- * to my_predecessor.
- * If source_successor is destination peer, then trail is from destination_peer
- * to source_successor. */
-};
+ uint64_t ultimate_destination_finger_identity_value;
-
-/**
- * P2P Notify New Successor message.
- */
-struct PeerNotifyNewSuccessorMessage
-{
/**
- * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_NOTIFY_NEW_SUCCESSOR
+ * Index in finger peer map of source peer.
*/
- struct GNUNET_MessageHeader header;
-
+ uint32_t finger_map_index;
+
/**
- * Source peer which wants to notify its new successor.
+ * Total number of peers in the trail.
*/
- struct GNUNET_PeerIdentity source_peer;
-
+ uint32_t trail_length;
+
/**
- * New successor identity.
+ * Identifier for the trail source peer is trying to setup.
*/
- struct GNUNET_PeerIdentity destination_peer;
-
+ struct GNUNET_HashCode trail_id;
/**
- * Number of peers in trail from source_peer to new successor.
+ * Relative time for which congested_peer will remain congested.
*/
- uint32_t trail_length;
-
- /* Trail to from source_peer to destination_peer. */
+ struct GNUNET_TIME_Relative congestion_time;
+
+ /* Trail_list from source_peer to peer which sent the message for trail setup
+ * to congested peer.*/
};
-struct PeerTrailTearDownMessage
+/**
+ * P2P Add Trail Message.
+ */
+struct PeerAddTrailMessage
{
/**
- * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_TEARDOWN
+ * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_ADD_TRAIL
*/
struct GNUNET_MessageHeader header;
-
+
/**
- * Source peer of this trail.
+ * Source peer of the routing trail.
*/
struct GNUNET_PeerIdentity source_peer;
-
+
/**
- * Destination peer of this trail.
+ * Destination peer of the routing trail.
*/
struct GNUNET_PeerIdentity destination_peer;
-
+
/**
- * Trail from source_peer to destination_peer compressed such that
- * new_first_friend is the first hop in the trail from source to
- * destination.
+ * Total number of peers from source peer to destination peer.
*/
- struct GNUNET_PeerIdentity new_first_friend;
+ unsigned int trail_length;
+
/**
- * Number of peers in trail from source_peer to new first friend.
+ * Unique identifier of the trail.
*/
- uint32_t trail_length;
-
- /* Trail to from source_peer to new first friend. */
+ struct GNUNET_HashCode trail_id;
+
+ /* Trail from source peer to destination peer. */
};
GNUNET_NETWORK_STRUCT_END
-
/**
* Linked list of messages to send to a particular other peer.
*/
* Message importance level. FIXME: used? useful?
*/
unsigned int importance;
-
+
/**
* When does this message time out?
*/
struct GNUNET_TIME_Absolute timeout;
-
+
/**
* Actual message to be sent, allocated at the end of the struct:
* // msg = (cast) &pm[1];
/**
- * Linked List of peers which are part of trail to reach a particular Finger.
+ * Entry in friend_peermap.
*/
-struct TrailPeerList
+struct FriendInfo
{
- /**
- * Pointer to next item in the list
- */
- struct TrailPeerList *next;
-
- /**
- * Pointer to previous item in the list
- */
- struct TrailPeerList *prev;
-
- /**
- * An element in this trail list
- */
- struct GNUNET_PeerIdentity peer;
-
-};
-
-
-/**
- * Entry in friend_peermap.
- */
-struct FriendInfo
-{
- /**
- * Friend Identity
- */
- struct GNUNET_PeerIdentity id;
+ /**
+ * Friend Identity
+ */
+ struct GNUNET_PeerIdentity id;
/**
- * 1. used in select_random_friend(), in case the friend has trails_count > TRAILS_THROUGH_FRIEND,
- * then choose another friend.
- * 2. in case of find_successor(), if the number of trails going through the friend
- * has already crossed, then choose another friend.
- * 3. in case of find_successor(), if we choose a finger, and if friend through
- * which we reach this finger has crossed the limit then choose another finger/friend.
- * 4. One way to implement in case of find_successor, is 1) you can have a global
- * array of the entries and only when an entry is added in finger table, friend table,
- * then you re calculate the array. In array while adding the element you check
- * the threshold of the friend in case its friend, and in case of finger check
- * the threshold of the first friend in the trail. If crossed then don't add the
- * entries in the array. When the count goes down, then again set a flag and
- * recalculte the array. Store a field in Finger table also, which will be
- * equal to number of trails going through the first friend.
- * Number of trail of which this friend is the first hop.
- * 5.FIXME: understand where you need to use memcpy or direct assignment.
+ * Number of trails for which this friend is the first hop.
*/
unsigned int trails_count;
-
+
/**
* Count of outstanding messages for this friend.
*/
unsigned int pending_count;
-
+
/**
- * FIXME: Refer to time.c and gnunet_time_lib.h for correct functions.
- * in handle_dht_p2p_trail_rejection, you should update these values
- * and whenever you are selecting a friend in select_random_friend()
- * and find_successor(), you should check congestion_duration = 0,
- * then proceed else if congestion_duration < your current time then also
- * proceed.
- * struct GNUNET_TIME_Absolute start = GNUNET_TIME_absolute_get();
- * struct GNUNET_TIME_Relative congestion_timeout =
- * congestion_duration = GNUNET_TIME_absolute_add (start,congestion_timeout);
+ * In case not 0, then amount of time for which this friend is congested.
*/
- struct GNUNET_TIME_Absolute congestion_duration;
-
+ struct GNUNET_TIME_Absolute congestion_timestamp;
+
/**
* Head of pending messages to be sent to this friend.
*/
* Tail of pending messages to be sent to this friend.
*/
struct P2PPendingMessage *tail;
-
+
/**
* Core handle for sending messages to this friend.
*/
};
-
/**
- * Entry in finger_peermap.
+ * An individual trail to reach to a finger.
*/
-struct FingerInfo
+struct Trail // "node" "element" "relay"
{
/**
- * Finger identity.
+ * Pointer to next item in the list
+ */
+ struct Trail *next;
+
+ /**
+ * Pointer to prev item in the list
+ */
+ struct Trail *prev;
+
+ /**
+ * An element in this trail.
*/
- struct GNUNET_PeerIdentity finger_identity;
-
+ struct GNUNET_PeerIdentity peer;
+};
+
+/**
+ * List of all trails to reach a particular finger.
+ */
+struct TrailList // "trail": list of "elements"
+{
/**
- * Index in finger peer map
+ * Head of trail.
*/
- unsigned int finger_map_index;
-
+ struct Trail *trail_head;
+
/**
- * Number of trails to reach to this finger.
+ * Tail of trail.
*/
- unsigned int trail_count;
-
+ struct Trail *trail_tail;
+
/**
- * Total number of entries in first trail from (me,finger)
+ * Unique identifier of this trail.
*/
- unsigned int first_trail_length;
-
+ struct GNUNET_HashCode trail_id;
+
/**
- * Total number of entries in second trail from (me,finger)
+ * Length of trail pointed
*/
- unsigned int second_trail_length;
-
-
+ unsigned int trail_length;
+
/**
- * Number of trail of which the first element to reach to this finger is
- * part of.
+ * Number of trails that the first friend of this trail is a part of.
*/
- unsigned int first_friend_trails_count;
-
+ unsigned int first_friend_trail_count; // remove this, duplicate variable!
+ // include a pointer to Friend or function that calculates it
+};
+
+/**
+ * An entry in finger_hashmap.
+ */
+struct FingerInfo
+{
/**
- * Head of first trail to reach this finger.
+ * Finger identity.
*/
- struct TrailPeerList *first_trail_head;
-
+ struct GNUNET_PeerIdentity finger_identity;
+
/**
- * Tail of first trail to reach this finger.
+ * Index in finger peer map
*/
- struct TrailPeerList *first_trail_tail;
-
+ uint32_t finger_map_index;
+
/**
- * Head of second trail to reach this finger.
+ * Number of trails setup so far for this finger.
*/
- struct TrailPeerList *second_trail_head;
-
+ uint32_t trails_count;
+
/**
- * Tail of second trail to reach this finger.
+ * Array of trails.
*/
- struct TrailPeerList *second_trail_tail;
-
+ struct TrailList trail_list[MAXIMUM_TRAILS_PER_FINGER]; // OK!
};
-
/**
- * FIXME: The name is not correct.
- * Used to specify the kind of value stored in the array all_known_peers.
+ * Data structure to keep track of closest peer seen so far in find_successor()
*/
-enum current_destination_type
+struct Closest_Peer
{
- FRIEND,
- FINGER,
- VALUE,
- MY_ID
-};
+ /**
+ * 64 bit value of the peer
+ */
+ uint64_t value;
+
+ /**
+ * Trail id to reach to peer.
+ */
+ struct GNUNET_HashCode trail_id;
+ /**
+ * First hop, NULL in case of friend and my_identity
+ */
+ struct GNUNET_PeerIdentity next_hop;
+
+ /**
+ * Next destination. In case of friend and my_identity , it is same as next_hop
+ * In case of finger it is finger identity.
+ */
+ struct GNUNET_PeerIdentity next_destination;
+};
/**
- * Data structure passed to sorting algorithm in find_successor().
+ * Data structure to store the trail chosen to reach to finger.
*/
-struct Sorting_List
+struct Correct_Trail
{
/**
- * 64 bit value of peer identity
+ * First friend in the trail to reach finger.
*/
- uint64_t peer_id;
-
+ struct FriendInfo friend;
+
/**
- * FIXME: think of a better name for both the struct and destination_type
- * Type : MY_ID, FINGER, FINGER, Value
+ * Identifier of this trail.
*/
- enum current_destination_type type;
-
+ struct GNUNET_HashCode trail_id;
+
/**
- * Pointer to original data structure linked to peer id.
+ * Total number of peers in this trail.
*/
- void *data;
+ unsigned int trail_length;
};
-
/**
* Task that sends FIND FINGER TRAIL requests. This task is started when we have
- * get our first friend.
+ * get our first friend.
*/
static GNUNET_SCHEDULER_TaskIdentifier find_finger_trail_task;
static struct GNUNET_PeerIdentity my_identity;
/**
- * Hash map of all the friends of a peer
+ * Peer map of all the friends of a peer
*/
static struct GNUNET_CONTAINER_MultiPeerMap *friend_peermap;
/**
* Hash map of all the fingers of a peer
*/
-static struct GNUNET_CONTAINER_MultiPeerMap *finger_peermap;
+static struct GNUNET_CONTAINER_MultiHashMap32 *finger_hashmap;
/**
* Handle to CORE.
static struct GNUNET_CORE_Handle *core_api;
/**
- * Finger map index for predecessor entry in finger peermap.
- */
-#define PREDECESSOR_FINGER_ID 64
-
-/**
- * Maximum number of trails allowed to go through a friend.
- * FIXME: Better name, Random value at the moment, need to be adjusted to maintain a balance
- * between performance and Sybil tolerance.
- */
-#define TRAIL_THROUGH_FRIEND_THRESHOLD 64
-
-/**
- * Possible number of different trails to reach to a finger. (Redundant routing)
- */
-#define TRAIL_COUNT 2
-
-/**
- * FIXME: better name.
- * Set to GNUNET_YES, when the number of trails going through all my friends
- * have reached the TRAIL_THROUGH_FRIEND_THRESHOLD.
- */
-static unsigned int all_friends_trail_threshold;
-
-/**
- * The current finger index that we have want to find trail to.
+ * The current finger index that we have want to find trail to. We start the
+ * search with value = 0, i.e. successor peer and then go to PREDCESSOR_FINGER_ID
+ * and decrement it. For any index 63 <= index < 0, if finger is same as successor,
+ * we reset this index to 0.
*/
static unsigned int current_search_finger_index;
-/**
- * Iterate over trail and search your index location in the array.
- * @param trail Trail which contains list of peers.
- * @param trail_length Number of peers in the trail.
- * @return Index in the array.
- * #GNUNET_SYSERR, in case there is no entry which should not be the case ideally.
- */
-static int
-search_my_index (const struct GNUNET_PeerIdentity *trail,
- int trail_length)
-{
- int i = 0;
-
- while (i < trail_length)
- {
- if (0 == GNUNET_CRYPTO_cmp_peer_identity (&my_identity, &trail[i]))
- {
- return i;
- }
- i++;
- }
- return GNUNET_SYSERR;
-}
-
-/**
- * Compare two peer identities.
- * @param p1 Peer identity
- * @param p2 Peer identity
- * @return 1 if p1 > p2, -1 if p1 < p2 and 0 if p1 == p2.
- */
-static int
-compare_peer_id (const void *p1, const void *p2)
-{
- struct Sorting_List *p11;
- struct Sorting_List *p22;
- int ret;
- p11 = GNUNET_malloc (sizeof (struct Sorting_List));
- p22 = GNUNET_malloc (sizeof (struct Sorting_List));
- p11 = (struct Sorting_List *)p1;
- p22 = (struct Sorting_List *)p2;
- ret = ( (p11->peer_id) > (p22->peer_id) ) ? 1 :
- ( (p11->peer_id) == (p22->peer_id) ) ? 0 : -1;
- return ret;
-}
-
-
-/**
- * Return the predecessor of value in all_known_peers.
- * @param all_known_peers list of all the peers
- * @param value value we have to search in the all_known_peers.
- * @param size Total numbers of elements
- * @return Predecessor
- */
-static struct Sorting_List *
-find_closest_predecessor(struct Sorting_List *all_known_peers, uint64_t value,
- unsigned int size)
-{
- int first;
- int last;
- int middle;
-
- first = 0;
- last = size - 1;
- middle = (first + last)/2;
-
- while(first <= last)
- {
- if(all_known_peers[middle].peer_id < value)
- {
- first = middle + 1;
- }
- else if(all_known_peers[middle].peer_id == value)
- {
- if(middle == 0)
- {
- return &all_known_peers[size - 1];
- }
- else
- {
- return &all_known_peers[middle - 1];
- }
- }
- else
- {
- last = middle - 1;
- }
-
- middle = (first + last)/2;
- }
- return NULL;
-}
-
-
-/**
- * Return the successor of value in all_known_peers.
- * @param all_known_peers list of all the peers
- * @param value value we have to search in the all_known_peers.
- * @param size Total numbers of elements
- * @return Successor
- */
-static struct Sorting_List *
-find_closest_successor(struct Sorting_List *all_known_peers, uint64_t value,
- unsigned int size)
-{
- int first;
- int last;
- int middle;
-
- first = 0;
- last = size - 1;
- middle = (first + last)/2;
-
- while(first <= last)
- {
- if(all_known_peers[middle].peer_id < value)
- {
- first = middle + 1;
- }
- else if(all_known_peers[middle].peer_id == value)
- {
- if(middle == (size -1))
- {
- return &all_known_peers[0];
- }
- else
- {
- return &all_known_peers[middle+1];
- }
- }
- else
- {
- last = middle - 1;
- }
-
- middle = (first + last)/2;
- }
- return NULL;
-}
-
-
/**
* Called when core is ready to send a message we asked for
* out to the destination.
struct P2PPendingMessage *pending;
size_t off;
size_t msize;
-
+
peer->th = NULL;
while ((NULL != (pending = peer->head)) &&
(0 == GNUNET_TIME_absolute_get_remaining (pending->timeout).rel_value_us))
{
peer->pending_count--;
- GNUNET_CONTAINER_DLL_remove (peer->head, peer->tail, pending);
+ GNUNET_CONTAINER_DLL_remove (peer->head, peer->tail, pending);
GNUNET_free (pending);
}
if (NULL == pending)
&core_transmit_notify, peer);
GNUNET_break (NULL != peer->th);
}
-
+
return off;
}
/**
+ * FIXME: assertion fails at the end of this function. also in core_api.c at 1299.
* Transmit all messages in the friend's message queue.
*
* @param peer message queue to process
process_friend_queue (struct FriendInfo *peer)
{
struct P2PPendingMessage *pending;
-
+
if (NULL == (pending = peer->head))
return;
if (NULL != peer->th)
return;
-
+
GNUNET_STATISTICS_update (GDS_stats,
gettext_noop
("# Bytes of bandwidth requested from core"),
ntohs (pending->msg->size), GNUNET_NO);
-
- /* FIXME: Are we correctly initializing importance and pending. */
+
peer->th =
GNUNET_CORE_notify_transmit_ready (core_api, GNUNET_NO,
pending->importance,
/**
- * Construct a trail message and forward it to a friend.
- * @param source_peer Peer which wants to set up the trail to one of its finger.
- * @param destination_finger Peer identity closest to this value will be
- * @a source_peer's finger.
- * @param current_destination Finger of the @a current_source, for which among
- * its friends, its own identity and all fingers, this
- * finger is the closest to the @a destination_finger
- * @param current_source Peer for which @a current_destination is its finger.
- * @param target_friend Friend to which this message should be forwarded.
- * @param trail_length Numbers of peers in the trail found so far.
- * @param trail_peer_list Peers this request has traversed so far
- * @param finger_map_index Index in finger peer map
+ * Construct a trail setup message and forward it to target_friend
+ * @param source_peer Source peer which wants to setup the trail
+ * @param ultimate_destination_finger Peer identity closest to this value will
+ * be finger to @a source_peer
+ * @param next_destination Peer which should get the packet. I can be same as
+ * target_friend or different.
+ * @param target_friend Friend to which message is forwarded now.
+ * @param trail_length Total number of peers in trail setup so far.
+ * @param trail_peer_list Trail setup so far
+ * @param finger_map_index Index in finger map for which we are looking for finger.
+ * @param trail_id Unique identifier for the trail we are trying to setup.
+ * @param intermediate_trail_id Trail id of any intermediate trail we may have to
+ * traverse during trail setup. If not used then set to
+ * 0.
*/
void
-GDS_NEIGHBOURS_send_trail_setup (const struct GNUNET_PeerIdentity *source_peer,
- uint64_t destination_finger,
- struct GNUNET_PeerIdentity *current_destination,
- struct GNUNET_PeerIdentity *current_source,
+GDS_NEIGHBOURS_send_trail_setup (const struct GNUNET_PeerIdentity source_peer,
+ uint64_t ultimate_destination_finger,
+ struct GNUNET_PeerIdentity next_destination,
struct FriendInfo *target_friend,
unsigned int trail_length,
const struct GNUNET_PeerIdentity *trail_peer_list,
- unsigned int finger_map_index)
+ unsigned int finger_map_index,
+ struct GNUNET_HashCode new_trail_id,
+ struct GNUNET_HashCode *intermediate_trail_id)
{
struct P2PPendingMessage *pending;
struct PeerTrailSetupMessage *tsm;
struct GNUNET_PeerIdentity *peer_list;
size_t msize;
-
- msize = sizeof (struct PeerTrailSetupMessage) +
+
+ msize = sizeof (struct PeerTrailSetupMessage) +
(trail_length * sizeof (struct GNUNET_PeerIdentity));
-
+
if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
GNUNET_break (0);
return;
}
-
+
if (target_friend->pending_count >= MAXIMUM_PENDING_PER_FRIEND)
- {
+ {
GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# P2P messages dropped due to full queue"),
1, GNUNET_NO);
}
-
- pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+
+ pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
pending->timeout = GNUNET_TIME_relative_to_absolute (GET_TIMEOUT);
- tsm = (struct PeerTrailSetupMessage *) &pending[1];
+ tsm = (struct PeerTrailSetupMessage *) &pending[1];
pending->msg = &tsm->header;
tsm->header.size = htons (msize);
tsm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP);
- memcpy (&(tsm->destination_finger), &destination_finger, sizeof (uint64_t));
- memcpy (&(tsm->source_peer), source_peer, sizeof (struct GNUNET_PeerIdentity));
- memcpy (&(tsm->current_destination), current_destination, sizeof (struct GNUNET_PeerIdentity));
- memcpy (&(tsm->current_source), current_source, sizeof (struct GNUNET_PeerIdentity));
- tsm->trail_length = htonl (trail_length);
+ tsm->ultimate_destination_finger = GNUNET_htonll (ultimate_destination_finger);
+ tsm->source_peer = source_peer;
+ tsm->next_destination = next_destination;
+ tsm->trail_length = htonl (trail_length);
tsm->finger_map_index = htonl (finger_map_index);
-
+ tsm->new_trail_id = new_trail_id;
+ if (NULL == intermediate_trail_id)
+ memset (&tsm->intermediate_trail_id, 0, sizeof (tsm->intermediate_trail_id));
+ else
+ tsm->intermediate_trail_id = *intermediate_trail_id;
if (trail_length > 0)
{
peer_list = (struct GNUNET_PeerIdentity *) &tsm[1];
GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
target_friend->pending_count++;
process_friend_queue (target_friend);
-
}
/**
- * Construct a trail setup result message and forward it to a friend.
+ * Construct a trail setup result message and forward it to target friend.
* @param destination_peer Peer which will get the trail to one of its finger.
* @param source_finger Peer to which the trail has been setup to.
* @param target_friend Friend to which this message should be forwarded.
* @param trail_length Numbers of peers in the trail.
* @param trail_peer_list Peers which are part of the trail from source to destination.
- * @param finger_map_index Index in finger peer map
+ * @param finger_map_index Index in finger peer map
+ * @param trail_id Unique identifier of the trail.
*/
void
-GDS_NEIGHBOURS_send_trail_setup_result (const struct GNUNET_PeerIdentity *destination_peer,
- const struct GNUNET_PeerIdentity *source_finger,
+GDS_NEIGHBOURS_send_trail_setup_result (struct GNUNET_PeerIdentity destination_peer,
+ struct GNUNET_PeerIdentity source_finger,
struct FriendInfo *target_friend,
unsigned int trail_length,
const struct GNUNET_PeerIdentity *trail_peer_list,
- unsigned int finger_map_index)
+ unsigned int finger_map_index,
+ struct GNUNET_HashCode trail_id)
{
struct P2PPendingMessage *pending;
struct PeerTrailSetupResultMessage *tsrm;
struct GNUNET_PeerIdentity *peer_list;
size_t msize;
-
- msize = sizeof (struct PeerTrailSetupResultMessage) +
+
+ msize = sizeof (struct PeerTrailSetupResultMessage) +
(trail_length * sizeof (struct GNUNET_PeerIdentity));
-
+
if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
GNUNET_break (0);
return;
}
-
+
if (target_friend->pending_count >= MAXIMUM_PENDING_PER_FRIEND)
- {
+ {
GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# P2P messages dropped due to full queue"),
1, GNUNET_NO);
}
-
- pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
- pending->importance = 0;
+
+ pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+ pending->importance = 0;
pending->timeout = GNUNET_TIME_relative_to_absolute (GET_TIMEOUT);
- tsrm = (struct PeerTrailSetupResultMessage *) &pending[1];
+ tsrm = (struct PeerTrailSetupResultMessage *) &pending[1];
pending->msg = &tsrm->header;
tsrm->header.size = htons (msize);
tsrm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP_RESULT);
- memcpy (&(tsrm->destination_peer), destination_peer, sizeof (struct GNUNET_PeerIdentity));
- memcpy (&(tsrm->finger_identity), source_finger, sizeof (struct GNUNET_PeerIdentity));
+ tsrm->destination_peer = destination_peer;
+ tsrm->finger_identity = source_finger;
tsrm->trail_length = htonl (trail_length);
tsrm->finger_map_index = htonl (finger_map_index);
-
+ tsrm->trail_id = trail_id;
+
peer_list = (struct GNUNET_PeerIdentity *) &tsrm[1];
if (trail_length > 0)
{
/**
- * Construct a PeerVerifySuccessor message and send it to friend.
- * @param source_peer Peer which wants to verify its successor
- * @param successor Peer which is our current successor
- * @param target_friend Friend to which this message should be forwarded.
- * @param trail_peer_list Peer which are part of trail from source to destination
- * @param trail_length Number of peers in the trail list.
+ * Send trail rejection message to next_hop
+ * @param source_peer Source peer which is trying to setup the trail.
+ * @param finger_identity Peer closest to this value will be @a source_peer's finger
+ * @param congested_peer Peer which sent this message as it is congested.
+ * @param next_hop Peer to which we are forwarding this message.
+ * @param finger_map_index Index in finger peermap for which we are searching for finger.
+ * @param trail_peer_list Trails seen so far in trail setup before getting rejected
+ * by congested_peer
+ * @param trail_length Total number of peers in trail_peer_list
+ * @param trail_id Unique identifier of this trail.
+ * @param congestion_timeout Duration given by congested peer as an estimate of
+ * how long it may remain congested.
*/
-void GDS_NEIGHBOURS_send_verify_successor(const struct GNUNET_PeerIdentity *source_peer,
- const struct GNUNET_PeerIdentity *successor,
- struct FriendInfo *target_friend,
- const struct GNUNET_PeerIdentity *trail_peer_list,
- unsigned int trail_length)
+void
+GDS_NEIGHBOURS_send_trail_rejection (struct GNUNET_PeerIdentity source_peer,
+ uint64_t finger_identity,
+ struct GNUNET_PeerIdentity congested_peer,
+ unsigned int finger_map_index,
+ struct GNUNET_PeerIdentity *trail_peer_list,
+ unsigned int trail_length,
+ struct GNUNET_HashCode trail_id,
+ struct FriendInfo *target_friend,
+ const struct GNUNET_TIME_Relative congestion_timeout)
{
- struct PeerVerifySuccessorMessage *vsm;
+ struct PeerTrailRejectionMessage *trm;
struct P2PPendingMessage *pending;
struct GNUNET_PeerIdentity *peer_list;
size_t msize;
-
- msize = sizeof (struct PeerVerifySuccessorMessage) +
+
+ msize = sizeof (struct PeerTrailRejectionMessage) +
(trail_length * sizeof (struct GNUNET_PeerIdentity));
-
+
if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
GNUNET_break (0);
return;
}
-
+
if (target_friend->pending_count >= MAXIMUM_PENDING_PER_FRIEND)
- {
+ {
GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# P2P messages dropped due to full queue"),
1, GNUNET_NO);
}
-
- pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
- pending->importance = 0; /* FIXME */
+
+ pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+ pending->importance = 0;
pending->timeout = GNUNET_TIME_relative_to_absolute (GET_TIMEOUT);
- vsm = (struct PeerVerifySuccessorMessage *) &pending[1];
- pending->msg = &vsm->header;
- vsm->header.size = htons (msize);
- vsm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_VERIFY_SUCCESSOR);
- memcpy (&(vsm->successor), successor, sizeof (struct GNUNET_PeerIdentity));
- memcpy (&(vsm->source_peer), source_peer, sizeof (struct GNUNET_PeerIdentity));
- vsm->trail_length = htonl (trail_length);
-
+ trm = (struct PeerTrailRejectionMessage *)&pending[1];
+ pending->msg = &trm->header;
+ trm->header.size = htons (msize);
+ trm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_REJECTION);
+ trm->source_peer = source_peer;
+ trm->congested_peer = congested_peer;
+ trm->congestion_time = congestion_timeout;
+ trm->finger_map_index = htonl (finger_map_index);
+ trm->trail_id = trail_id;
+
+ peer_list = (struct GNUNET_PeerIdentity *) &trm[1];
if (trail_length > 0)
{
- peer_list = (struct GNUNET_PeerIdentity *) &vsm[1];
memcpy (peer_list, trail_peer_list, trail_length * sizeof (struct GNUNET_PeerIdentity));
}
-
/* Send the message to chosen friend. */
GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
target_friend->pending_count++;
process_friend_queue (target_friend);
-
}
/**
- * Construct a PeerVerifySuccessorResult message and send it to friend.
- * @param destination_peer Peer which sent verify successor message
- * @param source_successor Peer to which verify successor message was sent.
- * @param my_predecessor source_successor's predecessor.
- * @param target_friend Friend to which this message should be forwarded.
- * @param trail_peer_list Peers which are part of trail from source to destination
- * @param trail_length Number of peers in the trail list.
+ * Construct a verify successor message and forward it to target_friend.
+ * @param source_peer Peer which wants to verify its successor.
+ * @param successor Peer which is @a source_peer's current successor.
+ * @param trail_id Identifier of trail to reach successor.
+ * @param trail Trail to reach from source_peer to successor
+ * @param trail_length Total number of peers in @a trail.
+ * @param target_friend Message send to this friend.
*/
-void GDS_NEIGHBOURS_send_verify_successor_result (const struct GNUNET_PeerIdentity *destination_peer,
- const struct GNUNET_PeerIdentity *source_successor,
- const struct GNUNET_PeerIdentity *my_predecessor,
- struct FriendInfo *target_friend,
- const struct GNUNET_PeerIdentity *trail_peer_list,
- unsigned int trail_length)
+void
+GDS_NEIGHBOURS_send_verify_successor_message (struct GNUNET_PeerIdentity source_peer,
+ struct GNUNET_PeerIdentity successor,
+ const struct GNUNET_HashCode trail_id,
+ struct GNUNET_PeerIdentity *trail,
+ unsigned int trail_length,
+ struct FriendInfo *target_friend)
{
- struct PeerVerifySuccessorResultMessage *vsmr;
+ struct PeerVerifySuccessorMessage *vsm;
struct P2PPendingMessage *pending;
struct GNUNET_PeerIdentity *peer_list;
size_t msize;
-
- msize = sizeof (struct PeerVerifySuccessorResultMessage) +
- (trail_length * sizeof(struct GNUNET_PeerIdentity));
-
+
+ msize = sizeof (struct PeerVerifySuccessorMessage);
if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
GNUNET_break (0);
return;
}
-
-
+
if (target_friend->pending_count >= MAXIMUM_PENDING_PER_FRIEND)
- {
+ {
GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# P2P messages dropped due to full queue"),
1, GNUNET_NO);
}
- pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+ pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
pending->importance = 0; /* FIXME */
pending->timeout = GNUNET_TIME_relative_to_absolute (GET_TIMEOUT);
- vsmr = (struct PeerVerifySuccessorResultMessage *) &pending[1];
- pending->msg = &vsmr->header;
- vsmr->header.size = htons (msize);
- vsmr->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_VERIFY_SUCCESSOR_RESULT);
- memcpy (&(vsmr->destination_peer), destination_peer, sizeof (struct GNUNET_PeerIdentity));
- memcpy (&(vsmr->source_successor), source_successor, sizeof (struct GNUNET_PeerIdentity));
- memcpy (&(vsmr->my_predecessor), my_predecessor, sizeof (struct GNUNET_PeerIdentity));
- vsmr->trail_length = htonl (trail_length);
+ vsm = (struct PeerVerifySuccessorMessage *) &pending[1];
+ pending->msg = &vsm->header;
+ vsm->header.size = htons (msize);
+ vsm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_VERIFY_SUCCESSOR);
+ vsm->source_peer = source_peer;
+ vsm->successor = successor;
+ vsm->trail_id = trail_id;
+ vsm->trail_length = htonl (trail_length);
+
if (trail_length > 0)
{
- peer_list = (struct GNUNET_PeerIdentity *) &vsmr[1];
- memcpy (peer_list, trail_peer_list, trail_length * sizeof (struct GNUNET_PeerIdentity));
+ peer_list = (struct GNUNET_PeerIdentity *) &vsm[1];
+ memcpy (peer_list, trail, trail_length * sizeof (struct GNUNET_PeerIdentity));
}
-
- /* Send the message to chosen friend. */
+
+ /* Send the message to chosen friend. */
GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
target_friend->pending_count++;
process_friend_queue (target_friend);
/**
- * Construct a PeerNotifyNewSuccessor message and send it to friend.
- * @param source_peer Peer which is sending notify message to its new successor.
- * @param destination_peer Peer which is the new destination.
- * @param target_friend Next friend to pass this message to.
- * @param peer_list List of peers in the trail to reach to destination_peer.
- * @param trail_length Total number of peers in peer list
+ * Construct a trail teardown message and send it to target_friend
+ * @param source_peer Source of the trail.
+ * @param destination_peer Destination of the trail.
+ * @param trail_id Unique identifier of the trail.
+ * @param trail_direction Direction of trail.
+ * @param target_friend Friend to get this message.
*/
-void
-GDS_NEIGHBOURS_send_notify_new_successor (const struct GNUNET_PeerIdentity *source_peer,
- const struct GNUNET_PeerIdentity *destination_peer,
- struct FriendInfo *target_friend,
- const struct GNUNET_PeerIdentity *trail_peer_list,
- unsigned int trail_length)
+void
+GDS_NEIGHBOURS_send_trail_teardown (struct GNUNET_PeerIdentity source_peer,
+ struct GNUNET_PeerIdentity destination_peer,
+ struct GNUNET_HashCode trail_id,
+ enum GDS_ROUTING_trail_direction trail_direction,
+ struct FriendInfo *target_friend)
{
- struct PeerNotifyNewSuccessorMessage *nsm;
+ struct PeerTrailTearDownMessage *ttdm;
struct P2PPendingMessage *pending;
- struct GNUNET_PeerIdentity *peer_list;
size_t msize;
-
- msize = sizeof (struct PeerNotifyNewSuccessorMessage) +
- (trail_length * sizeof(struct GNUNET_PeerIdentity));
-
+
+ msize = sizeof (struct PeerTrailTearDownMessage);
+
if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
GNUNET_break (0);
return;
}
-
+
if (target_friend->pending_count >= MAXIMUM_PENDING_PER_FRIEND)
- {
+ {
GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# P2P messages dropped due to full queue"),
1, GNUNET_NO);
}
-
- pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+
+ pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
pending->importance = 0; /* FIXME */
pending->timeout = GNUNET_TIME_relative_to_absolute (GET_TIMEOUT);
- nsm = (struct PeerNotifyNewSuccessorMessage *) &pending[1];
- pending->msg = &nsm->header;
- nsm->header.size = htons (msize);
- nsm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_NOTIFY_NEW_SUCCESSOR);
- memcpy (&(nsm->source_peer), source_peer, sizeof (struct GNUNET_PeerIdentity));
- memcpy (&(nsm->destination_peer), destination_peer, sizeof (struct GNUNET_PeerIdentity));
- nsm->trail_length = htonl (trail_length);
- /* FIXME: Here I am not checking the trail length, as I am assuming that for new
- successor our old successor is a part of trail, so trail length > 1. */
- peer_list = (struct GNUNET_PeerIdentity *) &nsm[1];
- memcpy (peer_list, trail_peer_list, trail_length * sizeof (struct GNUNET_PeerIdentity));
-
- /* Send the message to chosen friend. */
+ ttdm = (struct PeerTrailTearDownMessage *) &pending[1];
+ pending->msg = &ttdm->header;
+ ttdm->header.size = htons (msize);
+ ttdm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_TEARDOWN);
+ ttdm->source_peer = source_peer;
+ ttdm->destination_peer = destination_peer;
+ ttdm->TRAIL_ID = trail_id;
+ ttdm->trail_direction = htonl (trail_direction);
+
+ /* Send the message to chosen friend. */
GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
target_friend->pending_count++;
process_friend_queue (target_friend);
}
+
/**
- * Send a trail tear down message
- * @param source_peer Source of the trail.
- * @param destination_peer Destination of the trail.
- * @param discarded_trail Discarded trail from source to destination.
- * @param discarded_trail_length Total number of peers in trail_list.
- * @pararm target_peer Next peer to forward this message to.
- * @param new_first_friend The new first hop in the new trail from source to destination
- * peer.
+ * Construct a verify successor message and send it to target_friend
+ * @param destination_peer
+ * @param source_successor
+ * @param succ_predecessor
+ * @param trail_id
+ * @param trail
+ * @param trail_length
+ * @param target_friend
*/
void
-GDS_NEIGHBOURS_send_trail_teardown (const struct GNUNET_PeerIdentity *source_peer,
- const struct GNUNET_PeerIdentity *destination_peer,
- const struct GNUNET_PeerIdentity *discarded_trail,
- unsigned int discarded_trail_length,
- struct FriendInfo *target_friend,
- const struct GNUNET_PeerIdentity *new_first_friend)
+GDS_NEIGHBOURS_send_verify_successor_result (struct GNUNET_PeerIdentity destination_peer,
+ struct GNUNET_PeerIdentity source_successor,
+ struct GNUNET_PeerIdentity succ_predecessor,
+ struct GNUNET_HashCode trail_id,
+ const struct GNUNET_PeerIdentity *trail,
+ unsigned int trail_length,
+ enum GDS_ROUTING_trail_direction trail_direction,
+ struct FriendInfo *target_friend)
{
+ struct PeerVerifySuccessorResultMessage *vsmr;
struct P2PPendingMessage *pending;
- struct PeerTrailTearDownMessage *ttdm;
struct GNUNET_PeerIdentity *peer_list;
size_t msize;
-
- msize = sizeof (struct PeerTrailTearDownMessage) +
- (discarded_trail_length * sizeof(struct GNUNET_PeerIdentity));
-
+
+ msize = sizeof (struct PeerVerifySuccessorResultMessage) +
+ (trail_length * sizeof(struct GNUNET_PeerIdentity));
+
if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
GNUNET_break (0);
return;
}
-
+
if (target_friend->pending_count >= MAXIMUM_PENDING_PER_FRIEND)
- {
+ {
GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# P2P messages dropped due to full queue"),
1, GNUNET_NO);
}
-
- pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+
+ pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
pending->importance = 0; /* FIXME */
pending->timeout = GNUNET_TIME_relative_to_absolute (GET_TIMEOUT);
- ttdm = (struct PeerTrailTearDownMessage *) &pending[1];
- pending->msg = &ttdm->header;
- ttdm->header.size = htons (msize);
- ttdm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_TEARDOWN);
- memcpy (&(ttdm->source_peer), source_peer, sizeof (struct GNUNET_PeerIdentity));
- memcpy (&(ttdm->destination_peer), destination_peer, sizeof (struct GNUNET_PeerIdentity));
- memcpy (&(ttdm->new_first_friend),new_first_friend, sizeof (struct GNUNET_PeerIdentity));
- ttdm->trail_length = htonl (discarded_trail_length);
-
- peer_list = (struct GNUNET_PeerIdentity *) &ttdm[1];
- memcpy (peer_list, discarded_trail, discarded_trail_length * sizeof (struct GNUNET_PeerIdentity));
-
+ vsmr = (struct PeerVerifySuccessorResultMessage *) &pending[1];
+ pending->msg = &vsmr->header;
+ vsmr->header.size = htons (msize);
+ vsmr->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_VERIFY_SUCCESSOR_RESULT);
+ vsmr->destination_peer = destination_peer;
+ vsmr->my_predecessor = succ_predecessor;
+ vsmr->source_successor = source_successor;
+ vsmr->trail_direction = htonl (trail_direction);
+
+ if (trail_length > 0)
+ {
+ peer_list = (struct GNUNET_PeerIdentity *) &vsmr[1];
+ memcpy (peer_list, trail, trail_length * sizeof (struct GNUNET_PeerIdentity));
+ }
+
/* Send the message to chosen friend. */
GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
target_friend->pending_count++;
}
-/**
- * FIMXE: Change the return value, to handle the case where all friends
- * are congested.
- * FIXME: Handle congested peer - don't choose this friend, also don't choose
- * the friend if the link threshold has crossed. Not implemented yet.
- * Randomly choose one of your friends from the friends_peer map
- * @return Friend
+/**
+ * Construct a notify new successor message and send it to target_friend
+ * @param source_peer
+ * @param new_successor
+ * @param new_successor_trail
+ * @param new_successor_trail_length
+ * @param new_succesor_trail_id
*/
-static struct FriendInfo *
-select_random_friend ()
-{
- unsigned int current_size;
- unsigned int *index;
- unsigned int j = 0;
- struct GNUNET_CONTAINER_MultiPeerMapIterator *iter;
- struct GNUNET_PeerIdentity key_ret;
- struct FriendInfo *friend;
-
- current_size = GNUNET_CONTAINER_multipeermap_size (friend_peermap);
- index = GNUNET_CRYPTO_random_permute (GNUNET_CRYPTO_QUALITY_WEAK, current_size);
- iter = GNUNET_CONTAINER_multipeermap_iterator_create (friend_peermap);
-
- while(j < (*index))
- {
- if(GNUNET_YES == GNUNET_CONTAINER_multipeermap_iterator_next (iter,NULL,NULL))
- {
- j++;
- }
- else
- return NULL;
- }
+void
+GDS_NEIGHBOURS_send_notify_new_successor (struct GNUNET_PeerIdentity source_peer,
+ struct GNUNET_PeerIdentity new_successor,
+ struct GNUNET_PeerIdentity *new_successor_trail,
+ unsigned int new_successor_trail_length,
+ struct GNUNET_HashCode new_succesor_trail_id,
+ struct FriendInfo *target_friend)
+{
+ struct PeerNotifyNewSuccessorMessage *nsm;
+ struct P2PPendingMessage *pending;
+ struct GNUNET_PeerIdentity *peer_list;
+ size_t msize;
- if(GNUNET_YES == GNUNET_CONTAINER_multipeermap_iterator_next (iter,&key_ret,(const void **)&friend))
+ msize = sizeof (struct PeerNotifyNewSuccessorMessage) +
+ (new_successor_trail_length * sizeof(struct GNUNET_PeerIdentity));
+
+ if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
- /* Possible number of trails that can go through this friend has been reached. */
- if (friend->trails_count > TRAIL_THROUGH_FRIEND_THRESHOLD)
- {
- /* FIXME: What should I do now, should I call this same function again and
- remember the index, j so that call random function without j and find
- a new friend. Also, I need some way to make sure that if number of times
- I have called the function is equal to number of entries in friend peermap.
- then I should return NULL. but its much better to have a function which
- just eliminates looking at the entries with threshold crossed. URGENT: Whats
- the best way to handle this case? */
- }
- return friend;
+ GNUNET_break (0);
+ return;
}
- else
- return NULL;
-}
+ if (target_friend->pending_count >= MAXIMUM_PENDING_PER_FRIEND)
+ {
+ GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# P2P messages dropped due to full queue"),
+ 1, GNUNET_NO);
+ }
-/**
- * Compute finger_identity to which we want to setup the trail
- * @return finger_identity
- */
-static uint64_t
-compute_finger_identity()
-{
- uint64_t my_id64 ;
+ pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+ pending->importance = 0; /* FIXME */
+ pending->timeout = GNUNET_TIME_relative_to_absolute (GET_TIMEOUT);
+ nsm = (struct PeerNotifyNewSuccessorMessage *) &pending[1];
+ pending->msg = &nsm->header;
+ nsm->header.size = htons (msize);
+ nsm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_NOTIFY_NEW_SUCCESSOR);
+ nsm->source_peer = source_peer;
+ nsm->destination_peer = new_successor;
+ nsm->trail_length = htonl (new_successor_trail_length);
+ nsm->trail_id = new_succesor_trail_id;
+ if (new_successor_trail_length > 0)
+ {
+ peer_list = (struct GNUNET_PeerIdentity *) &nsm[1];
+ memcpy (peer_list, new_successor_trail,
+ new_successor_trail_length * sizeof (struct GNUNET_PeerIdentity));
+ }
- memcpy (&my_id64, &my_identity, sizeof (uint64_t));
- my_id64 = GNUNET_ntohll (my_id64);
- return (my_id64 + (unsigned long) pow (2, current_search_finger_index));
+ /* Send the message to chosen friend. */
+ GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
+ target_friend->pending_count++;
+ process_friend_queue (target_friend);
}
/**
- * Compute immediate predecessor identity in the network.
- * @return peer identity of immediate predecessor.
+ * Construct an add_trail message and send it to target_friend
+ * @param source_peer Source of the trail.
+ * @param destination_peer Destination of the trail.
+ * @param trail_id Unique identifer of the trail
+ * @param trail Trail from @a source_peer to @a destination_peer
+ * @param trail_length Total number of peers in @a trail.
+ * @param target_friend Next peer to get this message.
*/
-static uint64_t
-compute_predecessor_identity()
-{
- uint64_t my_id64;
-
- memcpy (&my_id64, &my_identity, sizeof (uint64_t));
- my_id64 = GNUNET_ntohll (my_id64);
- return (my_id64 -1);
-}
+void
+GDS_NEIGHBOURS_send_add_trail (struct GNUNET_PeerIdentity source_peer,
+ struct GNUNET_PeerIdentity destination_peer,
+ struct GNUNET_HashCode trail_id,
+ struct GNUNET_PeerIdentity *trail,
+ unsigned int trail_length,
+ struct FriendInfo *target_friend)
+{
+ struct PeerAddTrailMessage *adm;
+ struct GNUNET_PeerIdentity *peer_list;
+ struct P2PPendingMessage *pending;
+ size_t msize;
+ msize = sizeof (struct PeerAddTrailMessage) +
+ (trail_length * sizeof(struct GNUNET_PeerIdentity));
-/**
- * Ping your successor to verify if it is still your successor or not.
- */
-static void
-send_verify_successor_message()
-{
- struct GNUNET_CONTAINER_MultiPeerMapIterator *finger_iter;
- struct GNUNET_PeerIdentity key_ret;
- struct FriendInfo *target_friend;
- struct GNUNET_PeerIdentity next_hop;
- struct GNUNET_PeerIdentity *peer_list;
- struct FingerInfo *finger;
- unsigned int finger_index;
- int flag = 0;
-
- /* Find the successor from the finger peermap.*/
- finger_iter = GNUNET_CONTAINER_multipeermap_iterator_create (finger_peermap);
- for (finger_index = 0; finger_index < GNUNET_CONTAINER_multipeermap_size (finger_peermap); finger_index++)
- {
- if(GNUNET_YES == GNUNET_CONTAINER_multipeermap_iterator_next (finger_iter, &key_ret,
- (const void **)&finger))
- {
- if (0 == finger->finger_map_index)
- {
- flag = 1;
- break;
- }
- }
- }
- GNUNET_CONTAINER_multipeermap_iterator_destroy (finger_iter);
-
- /* Either you don't have a successor or you are your own successor, then don't
- send a successor message. */
- if(( flag == 0) ||
- (0 == GNUNET_CRYPTO_cmp_peer_identity(&my_identity, &(finger->finger_identity))))
+ if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
+ GNUNET_break (0);
return;
}
- if (finger->first_trail_length > 0)
+ if (target_friend->pending_count >= MAXIMUM_PENDING_PER_FRIEND)
{
- struct TrailPeerList *iterate;
- int i = 0;
- peer_list = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity) * finger->first_trail_length);
- iterate = finger->first_trail_head;
-
- while ( i < (finger->first_trail_length))
- {
-
- memcpy (&peer_list[i], &(iterate->peer), sizeof (struct GNUNET_PeerIdentity));
- iterate = iterate->next;
- i++;
- }
- memcpy (&next_hop, &peer_list[0], sizeof (struct GNUNET_PeerIdentity));
- target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &next_hop);
+ GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# P2P messages dropped due to full queue"),
+ 1, GNUNET_NO);
}
- else
+
+ pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+ pending->importance = 0; /* FIXME */
+ pending->timeout = GNUNET_TIME_relative_to_absolute (GET_TIMEOUT);
+ adm = (struct PeerAddTrailMessage *) &pending[1];
+ pending->msg = &adm->header;
+ adm->header.size = htons (msize);
+ adm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_ADD_TRAIL);
+ adm->source_peer = source_peer;
+ adm->destination_peer = destination_peer;
+ adm->trail_length = htonl (trail_length);
+ adm->trail_id = trail_id;
+
+ if (trail_length > 0)
{
- /* If trail length = 0, then our successor is our friend. */
- peer_list = NULL;
- target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
- &(finger->finger_identity));
+ peer_list = (struct GNUNET_PeerIdentity *)&adm[1];
+ memcpy (peer_list, trail, sizeof (struct GNUNET_PeerIdentity) * trail_length);
}
-
- GDS_NEIGHBOURS_send_verify_successor (&my_identity,
- &(finger->finger_identity),
- target_friend,
- peer_list,
- finger->first_trail_length);
+
+ /* Send the message to chosen friend. */
+ GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
+ target_friend->pending_count++;
+ process_friend_queue (target_friend);
+
}
/**
- * FIXME:
- * 1. Need to handle the case where all friends are either congested or
- * have reached their threshold.
- * 2. If we need all_friends_trail_threshold
- * 3. do we need to check if friend peermap is empty or not.
- * Choose a random friend and start looking for the trail to reach to
- * finger identity through this random friend.
- *
- * @param cls closure for this task
- * @param tc the context under which the task is running
+ * Merge into "teardown", add source and "last/new_first" in message struct.
+ * Construct a trail compression message and send it to target_friend.
+ * @param source_peer Source of the trail.
+ * @param destination_finger Destination of trail.
+ * @param trail_id Unique identifier of trail.
+ * @param first_friend First hop in compressed trail to reach from source to finger
+ * @param target_friend Next friend to get this message.
*/
-static void
-send_find_finger_trail_message (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+void
+GDS_NEIGHBOURS_send_trail_compression (struct GNUNET_PeerIdentity source_peer,
+ struct GNUNET_PeerIdentity destination_peer,
+ struct GNUNET_HashCode trail_id,
+ struct GNUNET_PeerIdentity first_friend,
+ struct FriendInfo *target_friend)
{
- struct FriendInfo *target_friend;
- struct GNUNET_TIME_Relative next_send_time;
- uint64_t finger_identity;
- unsigned int finger_map_index;
-
- next_send_time.rel_value_us =
- DHT_FIND_FINGER_TRAIL_INTERVAL.rel_value_us +
- GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
- DHT_FIND_FINGER_TRAIL_INTERVAL.rel_value_us);
- find_finger_trail_task =
- GNUNET_SCHEDULER_add_delayed (next_send_time, &send_find_finger_trail_message,
- NULL);
-
- if (GNUNET_YES == all_friends_trail_threshold)
- {
- /* All friends in friend peer map, have reached their trail threshold. No
- more new trail can be created. */
- return;
- }
-
- target_friend = select_random_friend ();
- if (NULL == target_friend)
+ struct P2PPendingMessage *pending;
+ struct PeerTrailCompressionMessage *tcm;
+ size_t msize;
+
+ msize = sizeof (struct PeerTrailCompressionMessage);
+
+ if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
- all_friends_trail_threshold = GNUNET_YES;
+ GNUNET_break (0);
return;
}
-
- if (PREDECESSOR_FINGER_ID == current_search_finger_index)
- {
- finger_identity = compute_predecessor_identity();
- }
- else
+
+ if (target_friend->pending_count >= MAXIMUM_PENDING_PER_FRIEND)
{
- finger_identity = compute_finger_identity();
+ GNUNET_STATISTICS_update (GDS_stats,
+ gettext_noop ("# P2P messages dropped due to full queue"),
+ 1, GNUNET_NO);
}
-
- finger_map_index = current_search_finger_index;
- GDS_NEIGHBOURS_send_trail_setup (&my_identity, finger_identity, &(target_friend->id),
- &my_identity, target_friend, 0, NULL, finger_map_index);
+
+ pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+ pending->importance = 0; /* FIXME */
+ pending->timeout = GNUNET_TIME_relative_to_absolute (GET_TIMEOUT);
+ tcm = (struct PeerTrailCompressionMessage *) &pending[1];
+ pending->msg = &tcm->header;
+ tcm->header.size = htons (msize);
+ tcm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_COMPRESSION);
+ tcm->source_peer = source_peer;
+ tcm->new_first_friend = first_friend;
+ tcm->trail_id = trail_id;
+ tcm->destination_peer = destination_peer;
+
+ GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
+ target_friend->pending_count++;
+ process_friend_queue (target_friend);
+
}
/**
- * FIXME: You need to handle the case of predecessor in case you don't get
- * the call from finger table add then you should not send a trail teardown message
- * because no one has added that in their trail.
- * Scan the trail to check if any of my own friend is part of trail. If yes
- * then shortcut the trail, send a trail teardown for the discarded trail,
- * update trail list and trail_length.
- * @param trail[Out] Current trail to reach to @a finger, will be updated
- * in case we compress the trail.
- * @param trail_length[Out] Number of peers in @a finger_trail, will be updated
- * in case we compress the trail.
- * @param finger Finger identity
+ * Seach my location in trail.
+ * @param trail List of peers
+ * @return my_index if found
+ * -1 if no entry found.
*/
-static void
-scan_and_compress_trail (struct GNUNET_PeerIdentity *trail,
- unsigned int *trail_length,
- const struct GNUNET_PeerIdentity *finger)
+static int
+search_my_index (const struct GNUNET_PeerIdentity *trail,
+ int trail_length)
{
int i;
- struct FriendInfo *target_friend;
-
- if (0 == GNUNET_CRYPTO_cmp_peer_identity (&my_identity,finger))
- {
- *trail_length = 0;
- trail = NULL;
- return;
- }
- if (GNUNET_CONTAINER_multipeermap_get (friend_peermap, finger))
+
+ for (i = 0; i < trail_length; i++)
{
- int discarded_trail_length = *trail_length;
- target_friend = GNUNET_CONTAINER_multipeermap_get(friend_peermap, &trail[0]);
- GDS_NEIGHBOURS_send_trail_teardown (&my_identity, finger, trail,
- discarded_trail_length, target_friend, finger);
- *trail_length = 0;
- trail = NULL;
- return;
+ if (0 == GNUNET_CRYPTO_cmp_peer_identity (&my_identity, &trail[i]))
+ return i;
}
-
- i = *trail_length - 1;
- while (i > 1)
+
+ return -1;
+}
+
+
+/**
+ * Iterate over the list of all the trails to reach Finger. In case the first
+ * friend to reach the finger has crossed the trail threshold or is congested,
+ * then don't select it. In case there multiple available good trails to reach
+ * to Finger, choose the one with shortest trail length.
+ * @param finger Finger
+ * @return struct Correct_Trail which contains the first friend , trail id
+ * and trail length. NULL in case none of the trails are free.
+ */
+static struct Correct_Trail *
+select_trail_to_finger (struct FingerInfo *finger)
+{
+ struct FriendInfo *friend;
+ struct TrailList *iterator;
+ struct Correct_Trail *finger_trail;
+ int i;
+
+ if (0 == GNUNET_CRYPTO_cmp_peer_identity (&finger->finger_identity,
+ &my_identity))
+ return NULL;
+
+ finger_trail = GNUNET_new (struct Correct_Trail);
+
+ for (i = 0; i < finger->trails_count; i++)
{
- if (NULL == GNUNET_CONTAINER_multipeermap_get (friend_peermap, &trail[i]))
+ iterator = &finger->trail_list[i];
+ if (iterator->trail_length > 0)
{
- /* This element of trail is not my friend. */
- i--;
+ friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+ &iterator->trail_head->peer);
}
else
{
- /* A --> B(friend 1) --> C(friend 2)--> D ---> E, then we can rewrite the trail as
- * C --> D --> E,
- * Now, we should remove the entry from A's routing table, B's routing table
- * and update the entry in C's routing table. Rest everything will be same.
- * C's routing table should have source peer as the prev.hop.
- */
- struct GNUNET_PeerIdentity *discarded_trail;
- struct FriendInfo *target_friend;
- int discarded_trail_length;
- int j = 0;
-
- discarded_trail_length = i - 1;
- discarded_trail = GNUNET_malloc (discarded_trail_length * sizeof (struct GNUNET_PeerIdentity));
- memcpy (discarded_trail, trail, discarded_trail_length * sizeof (struct GNUNET_PeerIdentity));
- target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &trail[0]);
- GDS_NEIGHBOURS_send_trail_teardown (&my_identity, finger, discarded_trail,
- discarded_trail_length, target_friend,
- &trail[i]);
-
- /* Copy the trail from index i to index trail_length -1 and change
- trail length and return */
- while (i < *trail_length)
+ friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+ &finger->finger_identity);
+ }
+
+ if ((friend->trails_count < TRAILS_THROUGH_FRIEND_THRESHOLD)||
+ ((0 == GNUNET_TIME_absolute_get_remaining (friend->congestion_timestamp).rel_value_us)))
+ {
+ if (iterator->trail_length == 0)
{
- memcpy (&trail[j], &trail[i], sizeof(struct GNUNET_PeerIdentity));
- j++;
- i++;
+ finger_trail->friend = *friend;
+ //finger_trail->trail_id = 0;
+ finger_trail->trail_length = 0;
+ return finger_trail;
+ }
+
+ if (finger_trail->trail_length > iterator->trail_length)
+ {
+ finger_trail->friend = *friend;
+ finger_trail->trail_id = iterator->trail_id;
+ finger_trail->trail_length = iterator->trail_length;
}
- *trail_length = j+1;
- return;
}
}
- return;
+
+ return finger_trail;
}
/**
- * FIXME: Is this correct? Here I am using dll_remove and its documentation
- * reads something else. Verify. Urgent.
- * Free finger and its trail.
- * @param finger Finger to be freed.
+ * Select closest finger to value.
+ * @param peer1 First peer
+ * @param peer2 Second peer
+ * @param value Value to be compare
+ * @return Closest peer
*/
-static void
-free_finger (struct FingerInfo *finger)
+static struct GNUNET_PeerIdentity *
+select_closest_finger (struct GNUNET_PeerIdentity *peer1,
+ struct GNUNET_PeerIdentity *peer2,
+ uint64_t value)
{
- struct TrailPeerList *peer;
-
- if(finger->first_trail_head != NULL)
- {
- while (NULL != (peer = finger->first_trail_head))
- {
- GNUNET_CONTAINER_DLL_remove (finger->first_trail_head, finger->first_trail_tail, peer);
- GNUNET_free (peer);
- }
- }
-
- if (finger->second_trail_head != NULL)
- {
- while (NULL != (peer = finger->second_trail_head))
- {
- GNUNET_CONTAINER_DLL_remove (finger->second_trail_head, finger->second_trail_tail, peer);
- GNUNET_free (peer);
- }
- GNUNET_free (finger);
- }
+#if 0
+ uint64_t peer1_value;
+ uint64_t peer2_value;
+
+ memcpy (&peer1_value, peer1, sizeof (uint64_t));
+ memcpy (&peer2_value, peer2, sizeof (uint64_t));
+
+ if ((peer1_value <= value) && (value <= peer2_value))
+ return peer2;
+ else if ((peer2_value <= value) && (value <= peer1_value))
+ return peer1;
+ else if ((peer1_value <= peer2_value) && (peer2_value <= value))
+ return peer1;
+ else if ((peer2_value <= peer1_value) && (peer1_value <= value))
+ return peer2;
+ else if ((value <= peer1_value) && (peer1_value <= peer2_value))
+ return peer1;
+ else /*if ((value <= peer2_value) && (peer2_value <= peer1_value))*/
+ return peer2;
+#endif
+ return NULL;
}
/**
- * FIXME: First check if both the trails are present if yes then send it
- * for both of them. Currently sending it only for one trail.
- * Send a trail teardown message for the trail of removed finger from the finger
- * peermap.
- * @param existing_finger Finger to removed from the finger peermap.
+ * Select closest predecessor to value.
+ * @param peer1 First peer
+ * @param peer2 Second peer
+ * @param value Value to be compare
+ * @return Closest peer
*/
-static
-void send_trail_teardown (struct FingerInfo *removed_finger)
+static struct GNUNET_PeerIdentity *
+select_closest_predecessor (struct GNUNET_PeerIdentity *peer1,
+ struct GNUNET_PeerIdentity *peer2,
+ uint64_t value)
{
- struct GNUNET_PeerIdentity *peer_list;
- struct FriendInfo *friend;
- struct TrailPeerList *finger_trail;
- int removed_finger_trail_length = removed_finger->first_trail_length;
- int i = 0;
+ #if 0
+ uint64_t peer1_value;
+ uint64_t peer2_value;
- if (removed_finger->first_trail_length == 0)
- return;
- finger_trail = removed_finger->first_trail_head;
- friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &(finger_trail->peer));
- peer_list = GNUNET_malloc ( removed_finger_trail_length * sizeof (struct GNUNET_PeerIdentity));
- while (i < removed_finger->first_trail_length)
- {
- memcpy (&peer_list[i], &(finger_trail->peer), sizeof (struct GNUNET_PeerIdentity));
- finger_trail = finger_trail->next;
- i++;
- }
-
- GDS_NEIGHBOURS_send_trail_teardown (&my_identity, &(removed_finger->finger_identity),
- peer_list, removed_finger_trail_length, friend,
- &(removed_finger->finger_identity));
+ memcpy (&peer1_value, peer1, sizeof (uint64_t));
+ memcpy (&peer2_value, peer2, sizeof (uint64_t));
+
+#endif
+ return NULL;
}
/**
- * FIXME: How do we understand which is the correct trail head?
- * Add a new trail to reach an existing finger in finger peermap and increment
- * the count of number of trails to reach to this finger.
- * @param existing_finger Finger
- * @param trail New trail to be added
- * @param trail_length Total number of peers in the trail.
+ * Select the closest peer among two peers (which should not be same)
+ * with respect to value and finger_map_index
+ * @param peer1 First peer
+ * @param peer2 Second peer
+ * @param value Value relative to which we find the closest
+ * @param finger_map_index Index in finger map. If equal to PREDECESSOR_FINGER_ID,
+ * then we use different logic than other
+ * finger_map_index
+ * @return Closest peer among two peers.
*/
-static
-void add_new_trail (struct FingerInfo *existing_finger,
- struct GNUNET_PeerIdentity *trail,
- unsigned int trail_length)
+static struct GNUNET_PeerIdentity *
+select_closest_peer (struct GNUNET_PeerIdentity *peer1,
+ struct GNUNET_PeerIdentity *peer2,
+ uint64_t value,
+ unsigned int finger_map_index)
{
- int i;
- i = 0;
- /* FIXME: Here you need to understand which trail is there and which not.
- In case first_trail_head != NULL, then that trail is present
- so you should add the second one. Need to verify this logic. */
- if (existing_finger->first_trail_head != NULL)
- {
- while (i < trail_length)
- {
- struct TrailPeerList *element;
- element = GNUNET_malloc (sizeof (struct TrailPeerList));
- element->next = NULL;
- element->prev = NULL;
-
- memcpy (&(element->peer), &trail[i], sizeof(struct GNUNET_PeerIdentity));
- GNUNET_CONTAINER_DLL_insert_tail(existing_finger->second_trail_head, existing_finger->second_trail_tail, element);
- i++;
- }
- }
- else if (existing_finger->second_trail_head != NULL)
- {
- while (i < trail_length)
- {
- struct TrailPeerList *element;
- element = GNUNET_malloc (sizeof (struct TrailPeerList));
- element->next = NULL;
- element->prev = NULL;
-
- memcpy (&(element->peer), &trail[i], sizeof(struct GNUNET_PeerIdentity));
- GNUNET_CONTAINER_DLL_insert_tail(existing_finger->first_trail_head, existing_finger->first_trail_tail, element);
- i++;
- }
- }
- existing_finger->trail_count++;
+ struct GNUNET_PeerIdentity *closest_peer;
+
+ if (PREDECESSOR_FINGER_ID == finger_map_index)
+ closest_peer = select_closest_predecessor (peer1, peer2, value);
+ else
+ closest_peer = select_closest_finger (peer1, peer2, value);
+
+ return closest_peer;
}
/**
- * In case there are already maximum number of possible trail to reach to a finger,
- * then check if the new trail's length is lesser than any of the existing trails.
- * If yes then replace that old trail by new trail.
- * Note: Here we are taking length as a parameter to choose the best possible trail,
- * but there could be other parameters also like - 1. duration of existence of a
- * trail - older the better. 2. if the new trail is completely disjoint than the
- * other trails, then may be choosing it is better.
- * @param existing_finger
- * @param trail
- * @param trail_length
- * @return #GNUNET_YES
- * #GNUNET_NO
+ * Find the successor for destination_finger_value among my_identity, all my
+ * friend and all my fingers. Don't consider friends or fingers
+ * which are congested or have crossed the threshold.
+ * @param destination_finger_value Peer closest to this value will be the next successor.
+ * @param next_destination [out] Updated to friend identity in case a friend is
+ * successor, updated to first friend to reach to finger
+ * in case finger is the destination.
+ * @param new_intermediate_trail_id [out] In case we finger is the @a next_destination,
+ * then we updated the field with trail id to reach
+ * to that finger.
+ * @param finger_map_index Index in finger peermap for which we are
+ * looking for a finger, to discern between
+ * IS_PREDECESSOR or not.
+ * @return
*/
-static
-void select_and_replace_trail (struct FingerInfo *existing_finger,
- struct GNUNET_PeerIdentity *new_trail,
- unsigned int new_trail_length)
+static struct GNUNET_PeerIdentity *
+find_successor (uint64_t destination_finger_value,
+ struct GNUNET_PeerIdentity *next_destination,
+ struct GNUNET_HashCode *new_intermediate_trail_id,
+ unsigned int finger_map_index)
{
- if (existing_finger->first_trail_length == existing_finger->second_trail_length)
+ struct Closest_Peer *successor;
+ struct GNUNET_PeerIdentity *next_hop;
+ struct GNUNET_CONTAINER_MultiPeerMapIterator *friend_iter;
+ struct GNUNET_CONTAINER_MultiHashMap32Iterator *finger_iter;
+ struct GNUNET_PeerIdentity *closest_peer;
+ struct Correct_Trail *finger_trail;
+ struct FriendInfo *friend;
+ struct FingerInfo *finger;
+ int i;
+
+ successor = GNUNET_new (struct Closest_Peer);
+ memcpy (&successor->value, &my_identity, sizeof (uint64_t));
+ //successor->trail_id = 0; /* FIXME:Default value for trail id */
+ successor->next_hop = my_identity;
+ successor->next_destination = my_identity;
+
+ friend_iter = GNUNET_CONTAINER_multipeermap_iterator_create (friend_peermap);
+ for (i= 0; i < GNUNET_CONTAINER_multipeermap_size (friend_peermap); i++)
{
- if (new_trail_length < existing_finger->first_trail_length)
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multipeermap_iterator_next (friend_iter, NULL,
+ (const void **)&friend));
+ if ((friend->trails_count > TRAILS_THROUGH_FRIEND_THRESHOLD)||
+ (0 != GNUNET_TIME_absolute_get_remaining (friend->congestion_timestamp).rel_value_us))
+ continue;
+
+ closest_peer = select_closest_peer (&my_identity, &friend->id,
+ destination_finger_value,
+ finger_map_index);
+ if (0 == GNUNET_CRYPTO_cmp_peer_identity (closest_peer, &friend->id))
{
- /* Randomly choose one of the trail. FIXME:currently I am just replacing the
- first trail.*/
- struct TrailPeerList *peer;
- int i = 0;
-
- while (NULL != (peer = existing_finger->first_trail_head))
- {
- GNUNET_CONTAINER_DLL_remove (existing_finger->first_trail_head, existing_finger->first_trail_tail, peer);
- GNUNET_free (peer);
- }
-
- while (i < new_trail_length)
- {
- struct TrailPeerList *element;
- element = GNUNET_malloc (sizeof (struct TrailPeerList));
- element->next = NULL;
- element->prev = NULL;
-
- memcpy (&(element->peer), &new_trail[i], sizeof(struct GNUNET_PeerIdentity));
- GNUNET_CONTAINER_DLL_insert_tail(existing_finger->second_trail_head, existing_finger->second_trail_tail, element);
- i++;
- }
+ memcpy (&successor->value, &friend->id, sizeof (uint64_t));
+ //successor->trail_id = 0;
+ successor->next_hop = friend->id;
+ successor->next_destination = friend->id;
}
}
- else if ((new_trail_length < existing_finger->second_trail_length) &&
- (existing_finger->second_trail_length < existing_finger->first_trail_length))
+
+ finger_iter = GNUNET_CONTAINER_multihashmap32_iterator_create (finger_hashmap);
+ for (i = 0; i < GNUNET_CONTAINER_multihashmap32_size (finger_hashmap); i++)
{
- /* Replace the first trail by the new trail. */
- struct TrailPeerList *peer;
- int i = 0;
-
- while (NULL != (peer = existing_finger->first_trail_head))
- {
- GNUNET_CONTAINER_DLL_remove (existing_finger->first_trail_head, existing_finger->first_trail_tail, peer);
- GNUNET_free (peer);
- }
-
- while (i < new_trail_length)
- {
- struct TrailPeerList *element;
- element = GNUNET_malloc (sizeof (struct TrailPeerList));
- element->next = NULL;
- element->prev = NULL;
-
- memcpy (&(element->peer), &new_trail[i], sizeof(struct GNUNET_PeerIdentity));
- GNUNET_CONTAINER_DLL_insert_tail(existing_finger->second_trail_head, existing_finger->second_trail_tail, element);
- i++;
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap32_iterator_next (finger_iter, NULL,
+ (void *)&finger));
+ finger_trail = select_trail_to_finger (finger);
+ if (NULL == finger_trail)
+ continue;
+
+ closest_peer = select_closest_peer (&my_identity,
+ &finger->finger_identity,
+ destination_finger_value,
+ finger_map_index);
+ if (0 == GNUNET_CRYPTO_cmp_peer_identity (closest_peer,
+ &finger->finger_identity))
+ {
+ memcpy (&successor->value, &finger->finger_identity, sizeof (uint64_t));
+ successor->trail_id = finger_trail->trail_id;
+ successor->next_hop = finger_trail->friend.id;
+ successor->next_destination = finger->finger_identity;
}
}
- else if ( (new_trail_length < existing_finger->first_trail_length) &&
- (existing_finger->first_trail_length < existing_finger->second_trail_length))
- {
- /* Replace the second trail by the new trail. */
- struct TrailPeerList *peer;
- int i = 0;
-
- while (NULL != (peer = existing_finger->second_trail_head))
- {
- GNUNET_CONTAINER_DLL_remove (existing_finger->second_trail_head, existing_finger->second_trail_tail, peer);
- GNUNET_free (peer);
- }
-
- while (i < new_trail_length)
- {
- struct TrailPeerList *element;
- element = GNUNET_malloc (sizeof (struct TrailPeerList));
- element->next = NULL;
- element->prev = NULL;
-
- memcpy (&(element->peer), &new_trail[i], sizeof(struct GNUNET_PeerIdentity));
- GNUNET_CONTAINER_DLL_insert_tail(existing_finger->second_trail_head, existing_finger->second_trail_tail, element);
- i++;
- }
- }
-}
+ next_destination = &successor->next_destination;
+ new_intermediate_trail_id = &successor->trail_id;
+ next_hop = &successor->next_hop;
+
+ return next_hop;
+}
/**
- * FIXME: If we remove a finger which is our friend, then how should we handle it.
- * Ideally only in case if the trail_length > 0,we increment the trail count
- * of the first friend in the trail to reach to the finger. in case finger is
- * our friend then trail length = 0, and hence, we have never incremented the
- * trail count associated with that friend.
- * Decrement the trail count for the first friend to reach to the finger.
- * @param finger
+ * 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 current_destination Next current destination which will get this message.
+ * @param current_source Source for @a current_destination
+ * @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 expiration_time When does the content expire
+ * @param data Content to store
+ * @param data_size Size of content @a data in bytes
*/
-static void
-decrement_friend_trail_count (struct FingerInfo *finger)
+void
+GDS_NEIGHBOURS_send_put (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 *target_peer,
+ uint32_t hop_count,
+ uint32_t put_path_length,
+ struct GNUNET_PeerIdentity *put_path,
+ struct GNUNET_TIME_Absolute expiration_time,
+ const void *data, size_t data_size)
{
- struct FriendInfo *first_trail_friend;
- struct FriendInfo *second_trail_friend;
-
- if(finger->first_trail_head != NULL)
- {
- first_trail_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
- &(finger->first_trail_head->peer));
- first_trail_friend->trails_count--;
- }
-
- if(finger->second_trail_head != NULL)
- {
- second_trail_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
- &(finger->second_trail_head->peer));
- second_trail_friend->trails_count--;
- }
-
-#if 0
- /* We will not need this variable any more, all_friends_trail_threshold,
- FIXME: REMOVE IT. */
- if (GNUNET_YES == all_friends_trail_threshold)
- {
- all_friends_trail_threshold = GNUNET_NO;
- /* FIXME; Here you should reschedule the send_find_finger_task here. or
- make a call.*/
- }
-#endif
-}
+}
/**
- * Select the closest finger. Used for both predecessor and other fingers..
- * But internally calls different functions for predecessor and other fingers.
- * @param existing_finger Finger in finger peermap.
- * @param new_finger New finger identity
- * @param finger_map_index Index in finger peermap where @a existing_finger is stored.
- * @return #GNUNET_YES if the new finger is closest.
- * #GNUNET_NO if the old finger is closest.
- * #GNUNET_SYSERR in case our own identity is closest (should never happen).
+ * 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 current_destination Next current destination which will get this message.
+ * @param current_source Source for @a current_destination
+ * @param target_peer Peer to which this message will be forwarded.
+ * @param hop_count Number of hops 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
*/
-static
-int select_finger (struct FingerInfo *existing_finger,
- const struct GNUNET_PeerIdentity *new_finger,
- unsigned int finger_map_index)
+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 *target_peer,
+ uint32_t hop_count,
+ uint32_t get_path_length,
+ struct GNUNET_PeerIdentity *get_path)
{
- struct Sorting_List peers[3]; /* 3 for existing_finger, new_finger, my_identity */
- struct Sorting_List *closest_finger;
- uint64_t value;
- int k;
-
- for (k = 0; k < 3; k++)
- peers[k].data = 0;
-
- /* Add your entry to peers. */
- memcpy (&peers[0], &my_identity, sizeof (uint64_t));
- peers[0].type = MY_ID;
- peers[0].data = NULL;
-
- /* Add existing_finger identity to the peers. */
- memcpy (&peers[1], &(existing_finger->finger_identity), sizeof (uint64_t));
- peers[1].type = FINGER;
- peers[1].data = existing_finger;
-
- /* Add new_finger identity to the peers. s*/
- memcpy (&peers[2], &new_finger, sizeof (uint64_t));
- peers[2].type = VALUE;
- peers[2].data = NULL;
-
- memcpy (&value, &my_identity, sizeof (uint64_t));
-
- qsort (&peers, 3, sizeof (struct Sorting_List), &compare_peer_id);
-
- if (PREDECESSOR_FINGER_ID == finger_map_index)
- closest_finger = find_closest_predecessor (peers, value, 3);
- else
- closest_finger = find_closest_successor (peers, value, 3);
-
- if (closest_finger->type == FINGER)
- {
- return GNUNET_NO;
- }
- else if (closest_finger->type == VALUE)
- {
- return GNUNET_YES;
- }
- else if (closest_finger->type == MY_ID);
- {
- return GNUNET_SYSERR;
- }
+
}
/**
- * FIXME: Do we need to reinsert the existing finger into finger peermap
- * in case we add a new trail?
- * Choose the closest finger between existing finger and new finger.
- * If the new finger is closest and finger_map_index != PREDECESSOR_FINGER_ID,
- * then send a trail_teardown message along existing_finger's trail.
- * In case both the id's are same, and there is a place to keep more trails, then
- * store both of them. In case there is no space to store any more trail, then
- * choose the best trail (best - depends on length in current_implementation) and
- * discard the others.
- * @param existing_finger Existing entry in finger peer map
- * @param new_finger New finger
- * @param trail Trail to reach to the new finger from me.
- * @param trail_length Number of peers in the @a trail
- * @param finger_map_index If finger_map_index == PREDECESSOR_FINGER_INDEX,
- * then we use a different logic to find the closest
- * predecessor.
- * @return #GNUNET_YES In case we want to store the new entry.
- * #GNUNET_NO In case we want the existing entry.
- * #GNUNET_SYSERR Error.
+ * Send the get result to requesting client.
+ * @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 get_path_length Number of peers in @a get_path
+ * @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
*/
-static
-int select_closest_finger (struct FingerInfo *existing_finger,
- const struct GNUNET_PeerIdentity *new_finger,
- struct GNUNET_PeerIdentity *trail,
- unsigned int trail_length,
- unsigned int finger_map_index)
+void
+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,
+ unsigned int get_path_length,
+ struct GNUNET_PeerIdentity *get_path,
+ struct GNUNET_TIME_Absolute expiration,
+ const void *data, size_t data_size)
{
- if (0 == GNUNET_CRYPTO_cmp_peer_identity (&(existing_finger->finger_identity), new_finger))
- {
- /* Both the new entry and existing entry are same. */
- if (0 == GNUNET_CRYPTO_cmp_peer_identity (&(existing_finger->finger_identity), &my_identity))
- {
- /* If existing_finger is my_identity then trail_length = 0, trail = NULL. In
- this case you don't need to check the trails. Exit. */
- return GNUNET_NO;
- }
- if (trail_length > 0)
- {
- scan_and_compress_trail (trail, &trail_length, new_finger);
- }
- if (existing_finger->trail_count < TRAIL_COUNT)
- {
- add_new_trail (existing_finger, trail, trail_length);
- return GNUNET_NO;
- }
- else
- {
- select_and_replace_trail (existing_finger, trail, trail_length);
- return GNUNET_NO;
- }
- }
- else if (GNUNET_YES == select_finger (existing_finger, new_finger, finger_map_index))
- {
- /* new_finger is the correct finger. */
- if (0 == GNUNET_CRYPTO_cmp_peer_identity (&my_identity, new_finger))
- {
- /* FIXME: Here in case the new finger is my_identity and old entry is not,
- should we keep the old entry even if the old entry is not the closest? */
- return GNUNET_NO;
- }
-
- /* Clear all things associated with existing_finger (only if its not a
- predecessor) */
- if (PREDECESSOR_FINGER_ID != finger_map_index)
- send_trail_teardown (existing_finger);
- decrement_friend_trail_count (existing_finger);
- free_finger (existing_finger);
-
- if (trail_length > 0)
- {
- scan_and_compress_trail (trail, &trail_length, new_finger);
- }
- return GNUNET_YES;
- }
- else if (GNUNET_NO == select_finger (existing_finger, new_finger,finger_map_index))
- {
- /* existing_finger is the correct finger. */
- return GNUNET_NO;
- }
- return GNUNET_SYSERR;
+
}
/**
- * Check if there is a predecessor in our finger peer map or not.
- * If no, then return GNUNET_YES
- * else compare existing predecessor and peer, and find the correct
- * predecessor.
- * @param existing_predecessor
- * @param new_predecessor
- * @return #GNUNET_YES if new peer is predecessor
- * #GNUNET_NO if new peer is not the predecessor.
+ * Randomly choose one of your friends (which is not congested and have not crossed
+ * trail threshold) from the friends_peer map
+ * @return Friend Randomly chosen friend.
+ * NULL in case friend peermap is empty, or all the friends are either
+ * congested or have crossed trail threshold.
*/
-static int
-compare_and_update_predecessor (const struct GNUNET_PeerIdentity *peer,
- struct GNUNET_PeerIdentity *trail,
- unsigned int trail_length)
+static struct FriendInfo *
+select_random_friend ()
{
- /* ! HAVE A PREDECESSOR || (source_peer closer than existing PREDECESOR) */
- struct FingerInfo *existing_finger;
- struct GNUNET_CONTAINER_MultiPeerMapIterator *finger_iter;
- struct FingerInfo *new_finger_entry;
- struct FriendInfo *first_friend_trail;
- int i;
- int old_entry_found = GNUNET_NO;
-
- finger_iter = GNUNET_CONTAINER_multipeermap_iterator_create (finger_peermap);
- for (i= 0; i < GNUNET_CONTAINER_multipeermap_size (finger_peermap); i++)
- {
- if(GNUNET_YES == GNUNET_CONTAINER_multipeermap_iterator_next (finger_iter, NULL,
- (const void **)&existing_finger))
- {
- if (PREDECESSOR_FINGER_ID == existing_finger->finger_map_index)
- {
- old_entry_found = GNUNET_YES;
- if( GNUNET_NO == select_closest_finger (existing_finger, peer, trail,
- trail_length,PREDECESSOR_FINGER_ID))
- return GNUNET_NO;
- else
- break;
- }
- }
- }
- GNUNET_CONTAINER_multipeermap_iterator_destroy (finger_iter);
- if(GNUNET_NO == old_entry_found)
- {
- trail_length = 0;
- trail = NULL;
- }
-
- new_finger_entry = GNUNET_malloc (sizeof (struct FingerInfo));
- memcpy (&(new_finger_entry->finger_identity), peer, sizeof (struct GNUNET_PeerIdentity));
- new_finger_entry->finger_map_index = PREDECESSOR_FINGER_ID;
- new_finger_entry->first_trail_length = trail_length;
- new_finger_entry->trail_count = 1;
-
- if (0 != GNUNET_CRYPTO_cmp_peer_identity(&my_identity,peer)) /* finger_trail is NULL in case I am my own finger identity. */
+ unsigned int current_size;
+ uint32_t index;
+ unsigned int j = 0;
+ struct GNUNET_CONTAINER_MultiPeerMapIterator *iter;
+ struct GNUNET_PeerIdentity key_ret;
+ struct FriendInfo *friend;
+
+ current_size = GNUNET_CONTAINER_multipeermap_size (friend_peermap);
+ if (0 == current_size)
+ return NULL;
+
+ index = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, current_size);
+ iter = GNUNET_CONTAINER_multipeermap_iterator_create (friend_peermap);
+
+ for (j = 0; j < index ; j++)
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multipeermap_iterator_next (iter, NULL, NULL));
+ do
{
- /* FIXME: Currently we are not handling the second trail. In that case, finger
- trail count = min (first_friend, second_friend) trail count. */
- /* Incrementing the friend trails count. */
- if (trail_length > 0)
+ if (j == current_size)
{
- first_friend_trail = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &trail[0]);
- first_friend_trail->trails_count++;
+ j = 0;
+ GNUNET_CONTAINER_multipeermap_iterator_destroy (iter);
+ iter = GNUNET_CONTAINER_multipeermap_iterator_create (friend_peermap);
+
}
- else
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multipeermap_iterator_next (iter,
+ &key_ret,
+ (const void **)&friend));
+
+
+ if ((TRAILS_THROUGH_FRIEND_THRESHOLD > friend->trails_count) &&
+ (0 == GNUNET_TIME_absolute_get_remaining (friend->congestion_timestamp).rel_value_us))
{
- /* It means the finger is my friend. */
- first_friend_trail = GNUNET_CONTAINER_multipeermap_get (friend_peermap, peer);
- first_friend_trail->trails_count++;
- }
- new_finger_entry->first_friend_trails_count = first_friend_trail->trails_count;
-
- /* Invert the trail and then add. */
- if (trail_length != 0)
- {
- i = trail_length - 1;
- while (i > 0)
- {
- struct TrailPeerList *element;
- element = GNUNET_malloc (sizeof (struct TrailPeerList));
- element->next = NULL;
- element->prev = NULL;
-
- memcpy (&(element->peer), &trail[i], sizeof(struct GNUNET_PeerIdentity));
- GNUNET_CONTAINER_DLL_insert_tail(new_finger_entry->first_trail_head, new_finger_entry->first_trail_tail, element);
- i--;
- }
- struct TrailPeerList *element;
- element = GNUNET_malloc (sizeof (struct TrailPeerList));
- element->next = NULL;
- element->prev = NULL;
- memcpy (&(element->peer), &trail[i], sizeof(struct GNUNET_PeerIdentity));
- GNUNET_CONTAINER_DLL_insert_tail(new_finger_entry->first_trail_head, new_finger_entry->first_trail_tail, element);
+ break;
}
- }
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CONTAINER_multipeermap_put (finger_peermap,
- &(new_finger_entry->finger_identity),
- new_finger_entry,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
-
- return GNUNET_YES;
+ friend = NULL;
+ j++;
+ } while (j != index);
+
+ GNUNET_CONTAINER_multipeermap_iterator_destroy (iter);
+ return friend;
}
/**
- * FIXME: Better name, and make the code more cleaner.
- * Compare the new finger entry added and our successor.
- * @return #GNUNET_YES if same.
- * #GNUNET_NO if not.
+ * FIXME: pass current_search_finger_index as parameter
+ * Compute finger_identity to which we want to setup the trail
+ * @return finger_identity
*/
-static int
-compare_new_entry_and_successor (const struct GNUNET_PeerIdentity *new_finger,
- int finger_map_index)
+static uint64_t
+compute_finger_identity()
{
- int successor_flag = 0;
- struct FingerInfo *successor_finger;
- struct GNUNET_CONTAINER_MultiPeerMapIterator *finger_iter;
- int i;
+ uint64_t my_id64;
- if (PREDECESSOR_FINGER_ID == finger_map_index)
- return GNUNET_NO;
-
- finger_iter = GNUNET_CONTAINER_multipeermap_iterator_create (finger_peermap);
- for (i= 0; i < GNUNET_CONTAINER_multipeermap_size (finger_peermap); i++)
- {
- if(GNUNET_YES == GNUNET_CONTAINER_multipeermap_iterator_next (finger_iter, NULL,
- (const void **)&successor_finger))
- {
- if (successor_finger->finger_map_index == 0)
- {
- successor_flag = 1;
- break;
- }
- }
- }
- GNUNET_CONTAINER_multipeermap_iterator_destroy (finger_iter);
-
- /* Ideally we should never reach here. */
- if (successor_flag == 0)
- {
- GNUNET_break (0);
- return GNUNET_NO;
- }
-
- if (0 == GNUNET_CRYPTO_cmp_peer_identity (new_finger, &(successor_finger->finger_identity)))
- return GNUNET_YES;
- else
- return GNUNET_NO;
+ memcpy (&my_id64, &my_identity, sizeof (uint64_t));
+ my_id64 = GNUNET_ntohll (my_id64);
+ return (my_id64 + (unsigned long) pow (2, current_search_finger_index));
}
/**
- * Add a new entry in finger table.
- * @param finger_identity PeerIdentity of the new finger
- * @param finger_trail Trail to reach to the finger, can be NULL in case I am my own
- * finger.
- * @param finger_trail_length Number of peers in the trail, can be 0 in case finger
- * is a friend or I am my own finger.
- * @param finger_map_index Index in finger map.
+ * Compute immediate predecessor identity in the network.
+ * @return peer identity of immediate predecessor.
*/
-static int
-add_new_entry (const struct GNUNET_PeerIdentity *finger_identity,
- struct GNUNET_PeerIdentity *finger_trail,
- uint32_t finger_trail_length,
- uint32_t finger_map_index)
+static uint64_t
+compute_predecessor_identity()
{
- struct FriendInfo *first_friend_trail;
- struct FingerInfo *new_finger_entry;
- int i;
-
- /* Add a new entry. */
- new_finger_entry = GNUNET_malloc (sizeof (struct FingerInfo));
- memcpy (&(new_finger_entry->finger_identity), finger_identity, sizeof (struct GNUNET_PeerIdentity));
- new_finger_entry->finger_map_index = finger_map_index;
- new_finger_entry->first_trail_length = finger_trail_length;
- new_finger_entry->trail_count = 1;
-
- if (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_identity,finger_identity)) /* finger_trail is NULL in case I am my own finger identity. */
- {
- /* Incrementing the friend trails count. */
- if (finger_trail_length > 0)
- {
- first_friend_trail = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &finger_trail[0]);
- first_friend_trail->trails_count++;
- }
- else
- {
- /* It means the finger is my friend. */
- first_friend_trail = GNUNET_CONTAINER_multipeermap_get (friend_peermap, finger_identity);
- first_friend_trail->trails_count++;
- }
- new_finger_entry->first_friend_trails_count = first_friend_trail->trails_count;
-
- /* Copy the trail. */
- i = 0;
- while (i < finger_trail_length)
- {
- struct TrailPeerList *element;
- element = GNUNET_malloc (sizeof (struct TrailPeerList));
- element->next = NULL;
- element->prev = NULL;
-
- memcpy (&(element->peer), &finger_trail[i], sizeof(struct GNUNET_PeerIdentity));
- GNUNET_CONTAINER_DLL_insert_tail(new_finger_entry->first_trail_head, new_finger_entry->first_trail_tail, element);
- i++;
- }
- }
-
- return GNUNET_CONTAINER_multipeermap_put (finger_peermap,
- &(new_finger_entry->finger_identity),
- new_finger_entry,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ uint64_t my_id64;
+
+ memcpy (&my_id64, &my_identity, sizeof (uint64_t));
+ my_id64 = GNUNET_ntohll (my_id64);
+ return (my_id64 -1);
}
-/**1. Should we check if there is already an entry for same finger id in the finger
- * peermap as we are checking for index. I think its too much of code and the use
- * of having unique identifier in finger map is only in case of find_successor
- * but anyways we will find the correct successor.
- * 2. you don't handle the second trail here as in new entry you will have only
- * one trail to reach to the finger.
- * Add an entry in the finger table. If there is already an existing entry in
- * the finger peermap for given finger map index, then choose the closest one.
- * In case both the new entry and old entry are same, store both of them. (Redundant
- * routing).
- * @param finger_identity
- * @param finger_trail
- * @param finger_trail_length
- * @param finger_map_index
- * @return #GNUNET_YES if the new entry is added.
- * #GNUNET_NO if the new entry is discarded.
+/*
+ * Choose a random friend and start looking for the trail to reach to
+ * finger identity through this random friend.
+ *
+ * @param cls closure for this task
+ * @param tc the context under which the task is running
*/
-static
-int finger_table_add (const struct GNUNET_PeerIdentity *finger_identity,
- struct GNUNET_PeerIdentity *finger_trail,
- uint32_t finger_trail_length,
- uint32_t finger_map_index)
+static void
+send_find_finger_trail_message (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct FingerInfo *existing_finger;
- struct GNUNET_CONTAINER_MultiPeerMapIterator *finger_iter;
- int i;
- int old_entry_found = GNUNET_NO;
- int new_entry_added = GNUNET_NO;
-
- if (PREDECESSOR_FINGER_ID == finger_map_index)
- {
- /* FIXME: Here GNUNET_NO, means that we did not update predecessor . But it
- we also need to handle the case that insertion failed in peer map after we decided to add
- the entry. */
- if( GNUNET_YES == compare_and_update_predecessor (finger_identity, finger_trail, finger_trail_length))
- new_entry_added = GNUNET_YES;
- goto update_current_search_finger_index;
- }
-
- /* Check if there is already an entry for the finger map index in the finger peer map. */
- finger_iter = GNUNET_CONTAINER_multipeermap_iterator_create (finger_peermap);
- for (i= 0; i < GNUNET_CONTAINER_multipeermap_size (finger_peermap); i++)
+ struct FriendInfo *target_friend;
+ struct GNUNET_TIME_Relative next_send_time;
+ struct GNUNET_HashCode trail_id;
+ unsigned int finger_map_index;
+ uint64_t finger_identity;
+
+ next_send_time.rel_value_us =
+ DHT_FIND_FINGER_TRAIL_INTERVAL.rel_value_us +
+ GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
+ DHT_FIND_FINGER_TRAIL_INTERVAL.rel_value_us);
+ find_finger_trail_task =
+ GNUNET_SCHEDULER_add_delayed (next_send_time, &send_find_finger_trail_message,
+ NULL);
+
+ target_friend = select_random_friend ();
+ if (NULL == target_friend)
{
- if(GNUNET_YES == GNUNET_CONTAINER_multipeermap_iterator_next (finger_iter, NULL,
- (const void **)&existing_finger))
- {
- if (existing_finger->finger_map_index == finger_map_index)
- {
- old_entry_found = GNUNET_YES;
- if ( GNUNET_NO == select_closest_finger (existing_finger, finger_identity,
- finger_trail, finger_trail_length,
- finger_map_index))
- goto update_current_search_finger_index;
- else
- break;
- }
- }
+ return;
}
- GNUNET_CONTAINER_multipeermap_iterator_destroy (finger_iter);
-
- if (GNUNET_NO == old_entry_found)
+
+ if (PREDECESSOR_FINGER_ID == current_search_finger_index)
{
- if (finger_trail_length > 0)
- {
- scan_and_compress_trail (finger_trail, &finger_trail_length, finger_identity);
- }
+ finger_identity = compute_predecessor_identity();
}
- /* SUPU: in this case you get GNUNET_NO, only when insertion fails in the peer map.
- so its an error as we already have decided to add the entry into finger peer map. */
- if(GNUNET_OK == add_new_entry (finger_identity,finger_trail,finger_trail_length, finger_map_index))
- new_entry_added = GNUNET_YES;
else
- return GNUNET_NO;
-
- update_current_search_finger_index:
- if (0 == finger_map_index)
- {
- current_search_finger_index = PREDECESSOR_FINGER_ID;
- if (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_identity,finger_identity))
- send_verify_successor_message();
- }
- else if (GNUNET_YES == compare_new_entry_and_successor (finger_identity,finger_map_index))
{
- current_search_finger_index = 0;
- }
- else
- {
- current_search_finger_index = current_search_finger_index - 1;
+ finger_identity = compute_finger_identity();
}
-
- return new_entry_added;
+
+ finger_map_index = current_search_finger_index;
+
+ GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_STRONG,
+ &trail_id, sizeof (trail_id));
+ GDS_NEIGHBOURS_send_trail_setup (my_identity, finger_identity,
+ target_friend->id, target_friend, 0, NULL,
+ finger_map_index, trail_id, NULL);
}
-
+
/**
- * FIXME: In case a friend is either congested or has crossed its trail threshold,
- * then don't consider it as next successor, In case of finger if its first
- * friend has crossed the threshold then don't consider it. In case no finger
- * or friend is found, then return NULL.
- * Find closest successor for the value.
- * @param value Value for which we are looking for successor
- * @param[out] current_destination set to my_identity in case I am the final destination,
- * set to friend identity in case friend is final destination,
- * set to first friend to reach to finger, in case finger
- * is final destination.
- * @param[out] current_source set to my_identity.
- * @return Peer identity of next hop to send trail setup message to,
- * NULL in case all the friends are either congested or have crossed
- * their trail threshold.
+ * In case there are already maximum number of possible trails to reach to a
+ * finger, then check if the new trail's length is lesser than any of the
+ * existing trails.
+ * If yes then replace that old trail by new trail.
+ *
+ * Note: Here we are taking length as a parameter to choose the best possible
+ * trail, but there could be other parameters also like:
+ * 1. duration of existence of a trail - older the better.
+ * 2. if the new trail is completely disjoint than the
+ * other trails, then may be choosing it is better.
+ *
+ * @param existing_finger
+ * @param new_finger_trail
+ * @param new_finger_trail_length
+ * @param new_finger_trail_id
*/
-static struct GNUNET_PeerIdentity *
-find_successor (uint64_t value, struct GNUNET_PeerIdentity *current_destination,
- struct GNUNET_PeerIdentity *current_source)
+static void
+select_and_replace_trail (struct FingerInfo *existing_finger,
+ struct GNUNET_PeerIdentity *new_trail,
+ unsigned int new_trail_length,
+ struct GNUNET_HashCode new_trail_id)
{
- struct GNUNET_CONTAINER_MultiPeerMapIterator *friend_iter;
- struct GNUNET_CONTAINER_MultiPeerMapIterator *finger_iter;
- struct GNUNET_PeerIdentity key_ret;
- struct FriendInfo *friend;
- struct FingerInfo *finger;
- unsigned int finger_index;
- unsigned int friend_index;
- struct Sorting_List *successor;
- unsigned int size;
- int j;
-
- /* 2 is added in size for my_identity and value which will part of all_known_peers. */
- size = GNUNET_CONTAINER_multipeermap_size (friend_peermap)+
- GNUNET_CONTAINER_multipeermap_size (finger_peermap)+
- 2;
-
- struct Sorting_List all_known_peers[size];
-
- int k;
- for (k = 0; k < size; k++)
- all_known_peers[k].peer_id = 0;
-
- /* Copy your identity at 0th index in all_known_peers. */
- j = 0;
- memcpy (&(all_known_peers[j].peer_id), &my_identity, sizeof (uint64_t));
- all_known_peers[j].type = MY_ID;
- all_known_peers[j].data = 0;
- j++;
-
- /* Copy value */
- all_known_peers[j].peer_id = value;
- all_known_peers[j].type = VALUE;
- all_known_peers[j].data = 0;
- j++;
-
- /* Iterate over friend peer map and copy all the elements into array. */
- friend_iter = GNUNET_CONTAINER_multipeermap_iterator_create (friend_peermap);
- for (friend_index = 0; friend_index < GNUNET_CONTAINER_multipeermap_size (friend_peermap); friend_index++)
+ struct TrailList *trail_list_iterator;
+ unsigned int largest_trail_length;
+ unsigned int largest_trail_index;
+ struct Trail *trail_element;
+ unsigned int i;
+
+ largest_trail_length = new_trail_length;
+ largest_trail_index = MAXIMUM_TRAILS_PER_FINGER + 1;
+
+ GNUNET_assert (MAXIMUM_TRAILS_PER_FINGER == existing_finger->trails_count);
+
+ for (i = 0; i < existing_finger->trails_count; i++)
{
- if(GNUNET_YES == GNUNET_CONTAINER_multipeermap_iterator_next(friend_iter,&key_ret,(const void **)&friend))
+ trail_list_iterator = &existing_finger->trail_list[i];
+ if (trail_list_iterator->trail_length > largest_trail_length)
{
- memcpy (&(all_known_peers[j].peer_id), &(friend->id), sizeof (uint64_t));
- all_known_peers[j].type = FRIEND;
- all_known_peers[j].data = friend;
- j++;
+ largest_trail_length = trail_list_iterator->trail_length;
+ largest_trail_index = i;
}
}
-
-
- /* Iterate over finger map and copy all the entries into all_known_peers array. */
- finger_iter = GNUNET_CONTAINER_multipeermap_iterator_create (finger_peermap);
- for (finger_index = 0; finger_index < GNUNET_CONTAINER_multipeermap_size (finger_peermap); finger_index++)
+
+ if (largest_trail_index == (MAXIMUM_TRAILS_PER_FINGER + 1))
{
- if(GNUNET_YES == GNUNET_CONTAINER_multipeermap_iterator_next(finger_iter,&key_ret,(const void **)&finger))
- {
- memcpy (&(all_known_peers[j].peer_id), &(finger->finger_identity), sizeof (uint64_t));
- all_known_peers[j].type = FINGER;
- all_known_peers[j].data = finger;
- j++;
- }
+ // tear down new trail: it's not better than the existing ones
+ return;
}
-
- GNUNET_CONTAINER_multipeermap_iterator_destroy (finger_iter);
- GNUNET_CONTAINER_multipeermap_iterator_destroy (friend_iter);
-
-
- qsort (&all_known_peers, size, sizeof (struct Sorting_List), &compare_peer_id);
-
- /* search value in all_known_peers array. */
- successor = find_closest_successor (all_known_peers, value, size);
-
- if (successor->type == MY_ID)
+
+ /* Send trail teardown message across the replaced trail. */
+ struct TrailList *replace_trail = &existing_finger->trail_list[largest_trail_index];
+ struct FriendInfo *target_friend =
+ GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+ &replace_trail->trail_head->peer);
+
+ GDS_NEIGHBOURS_send_trail_teardown (my_identity,
+ existing_finger->finger_identity,
+ replace_trail->trail_id,
+ GDS_ROUTING_SRC_TO_DEST, target_friend);
+ /* Free the trail. */
+ while (NULL != (trail_element = replace_trail->trail_head))
{
- memcpy (current_destination, &my_identity, sizeof (struct GNUNET_PeerIdentity));
- return &my_identity;
+ GNUNET_CONTAINER_DLL_remove (replace_trail->trail_head,
+ replace_trail->trail_tail, trail_element);
+ GNUNET_free (trail_element);
}
- else if (successor->type == FRIEND)
+
+ /* Add new trial at that location. */
+ i = 0;
+ while (i < new_trail_length)
{
- struct FriendInfo *target_friend;
- target_friend = (struct FriendInfo *)successor->data;
- memcpy (current_destination, &(target_friend->id), sizeof (struct GNUNET_PeerIdentity));
- memcpy (current_source, &my_identity, sizeof (struct GNUNET_PeerIdentity));
- return current_destination;
+ struct Trail *element = GNUNET_new (struct Trail);
+ element->peer = new_trail[i];
+
+ GNUNET_CONTAINER_DLL_insert_tail (replace_trail->trail_head,
+ replace_trail->trail_tail,
+ element);
}
- else if (successor->type == FINGER)
+}
+
+
+/**
+ * Check if the new trail to reach to finger is unique or do we already have
+ * such a trail present for finger.
+ * @param existing_finger Finger identity
+ * @param new_trail New trail to reach @a existing_finger
+ * @param trail_length Total number of peers in new_trail.
+ * @return #GNUNET_YES if the new trail is unique
+ * #GNUNET_NO if same trail is already present.
+ */
+static int
+is_new_trail_unique (struct FingerInfo *existing_finger,
+ struct GNUNET_PeerIdentity *new_trail,
+ unsigned int trail_length)
+{
+ struct TrailList *trail_list_iterator;
+ struct Trail *trail_element;
+ int i;
+ int j;
+ int trail_unique = GNUNET_NO;
+
+ for (i = 0; i < existing_finger->trails_count; i++)
{
- struct GNUNET_PeerIdentity *next_hop;
- struct FingerInfo *finger;
- finger = successor->data;
- next_hop = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity));
-
- if (finger->first_trail_length > 0)
+ trail_list_iterator = &existing_finger->trail_list[i];
+ if (trail_list_iterator->trail_length != trail_length)
+ continue;
+ trail_element = trail_list_iterator->trail_head;
+ for (j = 0; j < trail_list_iterator->trail_length; j++)
{
- struct TrailPeerList *iterator;
- iterator = GNUNET_malloc (sizeof (struct TrailPeerList));
- iterator = finger->first_trail_head;
- memcpy (next_hop, &(iterator->peer), sizeof (struct GNUNET_PeerIdentity));
+ if (0 != GNUNET_CRYPTO_cmp_peer_identity (&new_trail[j],
+ &trail_element->peer))
+ {
+ trail_unique = GNUNET_YES;
+ break;
+ }
}
- else /* This means finger is our friend. */
- memcpy (next_hop, &(finger->finger_identity), sizeof(struct GNUNET_PeerIdentity));
-
- memcpy (current_destination, &(finger->finger_identity), sizeof (struct GNUNET_PeerIdentity));
- memcpy (current_source, &my_identity, sizeof (struct GNUNET_PeerIdentity));
- return next_hop;
- }
- else
- {
- GNUNET_assert (0);
- return NULL;
}
+ return trail_unique;
}
/**
- * 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
- * @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 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
+ * Add a new trail to existing finger.
+ * @param existing_finger
+ * @param new_finger_trail
+ * @param new_finger_trail_length
+ * @param new_finger_trail_id
*/
-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,
- uint32_t hop_count,
- uint32_t put_path_length,
- struct GNUNET_PeerIdentity *put_path)
+static void
+add_new_trail (struct FingerInfo *existing_finger,
+ struct GNUNET_PeerIdentity *new_trail,
+ unsigned int new_trail_length,
+ struct GNUNET_HashCode new_trail_id)
{
- struct PeerPutMessage *ppm;
- struct P2PPendingMessage *pending;
- struct FriendInfo *target_friend;
- struct GNUNET_PeerIdentity *pp;
- size_t msize;
+ struct TrailList *trail_list_iterator;
+ struct FriendInfo *first_friend;
+ int i;
- msize = put_path_length * sizeof (struct GNUNET_PeerIdentity) + data_size +
- sizeof (struct PeerPutMessage);
-
- if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+ if (GNUNET_NO == is_new_trail_unique (existing_finger, new_trail,
+ new_trail_length))
{
- put_path_length = 0;
- msize = data_size + sizeof (struct PeerPutMessage);
- }
-
- if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
- {
- GNUNET_break (0);
return;
}
-
- /* This is the first call made from clients file. So, we should search for the
- target_friend. */
- if (NULL == target_peer)
- {
- uint64_t key_value;
- struct GNUNET_PeerIdentity *next_hop;
-
- memcpy (&key_value, key, sizeof (uint64_t));
- next_hop = find_successor (key_value, ¤t_destination, ¤t_source);
- if (0 == GNUNET_CRYPTO_cmp_peer_identity(next_hop, ¤t_destination)) /* I am the destination do datacache_put */
- {
- GDS_DATACACHE_handle_put (expiration_time, key, put_path_length, put_path,
- block_type, data_size, data);
- return;
- }
- else
- target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, next_hop);
- }
-
- pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
- pending->timeout = expiration_time;
- ppm = (struct PeerPutMessage *) &pending[1];
- pending->msg = &ppm->header;
- ppm->header.size = htons (msize);
- ppm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_PUT);
- ppm->options = htonl (options);
- ppm->block_type = htonl (block_type);
- ppm->hop_count = htonl (hop_count + 1);
- ppm->desired_replication_level = htonl (desired_replication_level);
- ppm->put_path_length = htonl (put_path_length);
- ppm->expiration_time = GNUNET_TIME_absolute_hton (expiration_time);
- ppm->key = *key;
- ppm->current_destination = current_destination;
- ppm->current_source = current_source;
-
- pp = (struct GNUNET_PeerIdentity *) &ppm[1];
- if (put_path_length != 0)
+ // FIXME checking trail_head is NOT a valid way to verify an open slot
+ for (i = 0; existing_finger->trail_list[i].trail_head != NULL; i++)
+ GNUNET_assert (i < MAXIMUM_TRAILS_PER_FINGER);
+
+ trail_list_iterator = &existing_finger->trail_list[i];
+
+ if (new_trail_length > 0)
+ first_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+ &new_trail[0]);
+ else
+ first_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+ &(existing_finger->finger_identity));
+ first_friend->trails_count++;
+ trail_list_iterator->first_friend_trail_count = first_friend->trails_count;
+ trail_list_iterator->trail_length = new_trail_length;
+
+ for (i = 0; i < new_trail_length; i++)
{
- memcpy (pp, put_path,
- sizeof (struct GNUNET_PeerIdentity) * put_path_length);
+ struct Trail *element;
+ element = GNUNET_new (struct Trail);
+
+ element->peer = new_trail[i];
+ GNUNET_CONTAINER_DLL_insert_tail (trail_list_iterator->trail_head,
+ trail_list_iterator->trail_tail,
+ element);
}
- memcpy (&pp[put_path_length], data, data_size);
- GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
- target_friend->pending_count++;
- process_friend_queue (target_friend);
+ existing_finger->trails_count++;
}
-
-/**
- * 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 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
+/**
+ * Send trail teardown message on all trails associated with finger.
+ * @param finger_to_be_removed
*/
-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 *target_peer,
- uint32_t hop_count,
- uint32_t get_path_length,
- struct GNUNET_PeerIdentity *get_path)
+static void
+send_trail_teardown (struct FingerInfo *finger)
{
- struct PeerGetMessage *pgm;
- struct P2PPendingMessage *pending;
+ struct TrailList *trail_list_iterator;
struct FriendInfo *target_friend;
- struct GNUNET_PeerIdentity *gp;
- size_t msize;
+ int i;
- msize = sizeof (struct PeerGetMessage) +
- (get_path_length * sizeof (struct GNUNET_PeerIdentity));
-
- if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
- {
- GNUNET_break (0);
+ if (0 == GNUNET_CRYPTO_cmp_peer_identity (&finger->finger_identity, &my_identity)
+ || (NULL != GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+ &finger->finger_identity)))
return;
- }
-
- if (NULL == target_peer)
+
+ for (i = 0; i < finger->trails_count; i++)
{
- /* This is the first call from client file, we need to search for next_hop*/
- struct GNUNET_PeerIdentity *next_hop;
- uint64_t key_value;
-
- memcpy (&key_value, key, sizeof (uint64_t));
- // FIXME: endianess of key_value!?
- next_hop = find_successor (key_value, ¤t_destination, ¤t_source);
-
- if (0 == GNUNET_CRYPTO_cmp_peer_identity(&my_identity,next_hop)) /* I am the destination do datacache_put */
+ trail_list_iterator = &finger->trail_list[i];
+ if (trail_list_iterator->trail_length > 0)
{
- GDS_DATACACHE_handle_get (key,block_type, NULL, 0,
- NULL, 0, 1, &my_identity, NULL,&my_identity);
- return;
- }
- else
- {
- target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, next_hop);
+ target_friend =
+ GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+ &trail_list_iterator->trail_head->peer);
+ // check target_friend
+ GDS_NEIGHBOURS_send_trail_teardown (my_identity, finger->finger_identity,
+ trail_list_iterator->trail_id,
+ GDS_ROUTING_SRC_TO_DEST,
+ target_friend);
}
}
-
- pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
- pending->importance = 0; /* FIXME */
- pgm = (struct PeerGetMessage *) &pending[1];
- pending->msg = &pgm->header;
- pgm->header.size = htons (msize);
- pgm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_GET);
- pgm->get_path_length = htonl (get_path_length);
- pgm->key = *key;
- pgm->current_destination = current_destination;
- pgm->current_source = current_source;
- pgm->hop_count = htonl (hop_count + 1);
-
- if (get_path != 0)
- {
- gp = (struct GNUNET_PeerIdentity *) &pgm[1];
- memcpy (gp, get_path, get_path_length * sizeof (struct GNUNET_PeerIdentity));
- }
- GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
- target_friend->pending_count++;
- process_friend_queue (target_friend);
}
/**
- * Send the get result to requesting client.
- * @param expiration When will this result expire?
- * @param key Key of the requested data.
- * @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 next_hop Next peer to forward the message to.
- * @param source_peer Peer which has the data for the key.
+ * Decrement the trail count of the first friend to reach the finger
+ * In case finger is the friend, then decrement its trail count.
+ * @param finger
*/
-void
-GDS_NEIGHBOURS_send_get_result (struct GNUNET_TIME_Absolute expiration,
- const struct GNUNET_HashCode *key,
- 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)
+static void
+decrement_friend_trail_count (struct FingerInfo *finger)
{
- struct PeerGetResultMessage *get_result;
- struct GNUNET_PeerIdentity *get_result_path;
- struct GNUNET_PeerIdentity *pp;
- struct P2PPendingMessage *pending;
+ struct TrailList *trail_list_iterator;
struct FriendInfo *target_friend;
- int current_path_index;
- size_t msize;
-
- msize = get_path_length * sizeof (struct GNUNET_PeerIdentity) + data_size +
- sizeof (struct PeerPutMessage);
-
- if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
- {
- GNUNET_break (0);
+ int i = 0;
+
+ if (0 == GNUNET_CRYPTO_cmp_peer_identity (&finger->finger_identity,
+ &my_identity))
return;
- }
-
- current_path_index = search_my_index(get_path, get_path_length);
- if (GNUNET_SYSERR == current_path_index)
+
+ for (i = 0; i < finger->trails_count; i++)
{
- GNUNET_break (0);
- return;
+ trail_list_iterator = &finger->trail_list[i];
+ if (trail_list_iterator->trail_length > 0)
+ target_friend =
+ GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+ &trail_list_iterator->trail_head->peer);
+ else
+ target_friend =
+ GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+ &finger->finger_identity);
+
+ // check target_friend for NULL
+ target_friend->trails_count--;
+ trail_list_iterator->first_friend_trail_count--;
}
- if (0 == current_path_index)
+ return;
+}
+
+
+/**
+ * Free finger and its trail.
+ * @param finger Finger to be freed.
+ */
+static void
+free_finger (struct FingerInfo *finger)
+{
+ struct TrailList *trail_list_iterator;
+ struct Trail *trail_element;
+ unsigned int i;
+
+ for (i = 0; i < finger->trails_count; i++)
{
- GDS_CLIENTS_handle_reply (expiration, key, get_path_length, get_path, put_path_length,
- put_path, type, data_size, data);
- return;
+ trail_list_iterator = &finger->trail_list[i];
+ while (NULL != (trail_element = trail_list_iterator->trail_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (trail_list_iterator->trail_head,
+ trail_list_iterator->trail_tail,
+ trail_element);
+ GNUNET_free (trail_element);
+ }
}
-
- pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
- pending->importance = 0;
- get_result = (struct PeerGetResultMessage *)&pending[1];
- pending->msg = &get_result->header;
- get_result->header.size = htons (msize);
- get_result->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_GET_RESULT);
- get_result->key = *key;
- memcpy (&(get_result->source_peer), source_peer, sizeof (struct GNUNET_PeerIdentity));
- get_result->expiration_time = expiration;
-
- if (get_path_length != 0)
+ GNUNET_free (finger);
+}
+
+
+/**
+ * FIXME: merge into finger_table_add
+ * FIXME: leave as simple a check
+ * Check if new finger is closer than existing_finger. If both new finger and
+ * existing finger are same then we may add a new trail (if there is space)
+ * or choose the best trail among existing trails and new trails.
+ * @param existing_finger Finger present in finger_peermap at @a finger_map_index
+ * or NULL if none
+ * @param new_finger_identity Peer identity of new finger.
+ * FIXME: all the following params *should* not be necessary
+ * @param new_finger_trail Trail to reach from source to new_finger.
+ * @param new_finger_trail_length Total number of peers in @a new_finger_trail.
+ * @param trail_id Unique identifier of trail.
+ * @param finger_map_index Index in finger map.
+ * @return #GNUNET_YES if the new finger is closest.
+ * #GNUNET_NO either new_finger and existing_finger are same, or
+ * existing_finger is closest.
+ */
+static int
+is_new_finger_closest (struct FingerInfo *existing_finger,
+ struct GNUNET_PeerIdentity new_finger_identity,
+ struct GNUNET_PeerIdentity *new_finger_trail,
+ unsigned int new_finger_trail_length,
+ struct GNUNET_HashCode new_finger_trail_id,
+ unsigned int finger_map_index)
+{
+ struct GNUNET_PeerIdentity *closest_peer;
+ uint64_t finger_identity_value;
+ uint64_t my_id64;
+
+ if (NULL == existing_finger)
+ return GNUNET_YES;
+
+ memcpy (&my_id64, &my_identity, sizeof (uint64_t));
+ if (0 != GNUNET_CRYPTO_cmp_peer_identity (&(existing_finger->finger_identity),
+ &new_finger_identity))
{
- get_result_path = (struct GNUNET_PeerIdentity *)&get_result[1];
- memcpy (get_result_path, get_path,
- sizeof (struct GNUNET_PeerIdentity) * get_path_length);
+ if (PREDECESSOR_FINGER_ID == finger_map_index)
+ finger_identity_value = my_id64 - 1;
+ else
+ finger_identity_value = my_id64 + (unsigned long) pow (2, finger_map_index);
+ closest_peer = select_closest_peer (&existing_finger->finger_identity,
+ &new_finger_identity,
+ finger_identity_value, finger_map_index);
+
+ if (0 == GNUNET_CRYPTO_cmp_peer_identity (&new_finger_identity, closest_peer))
+ {
+ GNUNET_assert (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_identity,
+ &new_finger_identity));
+
+ send_trail_teardown (existing_finger);
+ decrement_friend_trail_count (existing_finger);
+ free_finger (existing_finger);
+ return GNUNET_YES;
+ }
}
- memcpy (&get_result_path[get_path_length], data, data_size);
-
- /* FIXME: Is this correct? */
- if (put_path_length != 0)
+ else
{
- pp = (struct GNUNET_PeerIdentity *)&get_result_path[1];
- memcpy (pp, put_path,sizeof (struct GNUNET_PeerIdentity) * put_path_length);
+ if (0 == GNUNET_CRYPTO_cmp_peer_identity (&(existing_finger->finger_identity),
+ &my_identity))
+ {
+ return GNUNET_NO;
+ }
+ if (NULL ==
+ GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+ &(existing_finger->finger_identity)))
+ {
+ if (existing_finger->trails_count < MAXIMUM_TRAILS_PER_FINGER)
+ add_new_trail (existing_finger, new_finger_trail,
+ new_finger_trail_length, new_finger_trail_id);
+ else
+ select_and_replace_trail (existing_finger, new_finger_trail,
+ new_finger_trail_length, new_finger_trail_id);
+ }
}
- target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, next_hop);
- GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
- target_friend->pending_count++;
- process_friend_queue (target_friend);
+ return GNUNET_NO;
}
/**
- * Send trail rejection message to the peer which sent me a trail setup message.
- * @param source_peer Source peer which wants to set up the trail.
- * @param finger_identity Value whose successor will be the finger of @a source_peer.
- * @param congested_peer Peer which has send trail rejection message.
- * @param next_hop Peer to which this message should be forwarded.
- * @param finger_map_index Index in @a source_peer finger peermap.
- * @param trail_peer_list Trail followed to reach from @a source_peer to next_hop,
- * NULL, in case the @a congested_peer was the first peer
- * to which trail setup message was forwarded.
- * @param trail_length Number of peers in trail_peer_list.
+ * Add a new entry in finger hashmap at finger_map_index
+ * @param finger_identity Peer Identity of new finger
+ * @param finger_trail Trail to reach from me to finger (excluding both end points).
+ * @param finger_trail_length Total number of peers in @a finger_trail.
+ * @param trail_id Unique identifier of the trail.
+ * @param finger_map_index Index in finger hashmap.
+ * @return #GNUNET_OK if new entry is added
+ * #GNUNET_NO -- FIXME: need to check what value does hahsmap put
+ * returns on failure.
*/
-void
-GDS_NEIGHBOURS_send_trail_rejection (struct GNUNET_PeerIdentity *source_peer,
- uint64_t finger_identity,
- struct GNUNET_PeerIdentity *congested_peer,
- const struct GNUNET_PeerIdentity *next_hop,
- unsigned int finger_map_index,
- struct GNUNET_PeerIdentity *trail_peer_list,
- unsigned int trail_length)
+static int
+add_new_entry (struct GNUNET_PeerIdentity finger_identity,
+ struct GNUNET_PeerIdentity *finger_trail,
+ unsigned int finger_trail_length,
+ struct GNUNET_HashCode trail_id,
+ unsigned int finger_map_index)
{
- struct PeerTrailRejectionMessage *trail_rejection;
- struct GNUNET_PeerIdentity *trail_list;
- struct P2PPendingMessage *pending;
- struct FriendInfo *target_friend;
- size_t msize;
-
- msize = trail_length * sizeof(struct GNUNET_PeerIdentity) +
- sizeof (struct PeerTrailRejectionMessage);
-
- if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
- {
- GNUNET_break (0);
- return;
- }
-
- pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
- pending->importance = 0;
- pending->timeout = GNUNET_TIME_relative_to_absolute (GET_TIMEOUT);
- trail_rejection = (struct PeerTrailRejectionMessage *) &pending[1];
- pending->msg = &trail_rejection->header;
- trail_rejection->header.size = htons (msize);
- trail_rejection->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP);
- memcpy (&(trail_rejection->source_peer), source_peer, sizeof (struct GNUNET_PeerIdentity));
- memcpy (&(trail_rejection->congested_peer), congested_peer, sizeof (struct GNUNET_PeerIdentity));
- memcpy (&(trail_rejection->finger_identity_value), &finger_identity, sizeof (uint64_t));
- trail_rejection->finger_map_index = htonl(finger_map_index);
- trail_rejection->trail_length = htonl (trail_length);
-
- if (trail_length != 0)
+ struct FingerInfo *new_entry;
+ struct FriendInfo *first_trail_hop;
+ struct TrailList *first_trail;
+ int i = 0;
+
+ new_entry = GNUNET_new (struct FingerInfo);
+ new_entry->finger_identity = finger_identity;
+ new_entry->finger_map_index = finger_map_index;
+ new_entry->trails_count = 1;
+
+ if (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_identity, &finger_identity))
{
- trail_list = (struct GNUNET_PeerIdentity *)&trail_rejection[1];
- memcpy (trail_list, trail_peer_list, trail_length * sizeof (struct GNUNET_PeerIdentity));
+ if (finger_trail_length > 0)
+ {
+ first_trail_hop = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+ &finger_trail[0]);
+ }
+ else
+ {
+ first_trail_hop = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+ &finger_identity);
+ }
+
+ first_trail_hop->trails_count++;
+ first_trail = &new_entry->trail_list[0];
+ first_trail->first_friend_trail_count = first_trail_hop->trails_count;
+
+ while (i < finger_trail_length)
+ {
+ struct Trail *element = GNUNET_new (struct Trail);
+
+ element->next = NULL;
+ element->prev = NULL;
+ element->peer = finger_trail[i];
+ GNUNET_CONTAINER_DLL_insert_tail (first_trail->trail_head,
+ first_trail->trail_tail,
+ element);
+ i++;
+ }
}
-
- target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, next_hop);
- GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
- target_friend->pending_count++;
- process_friend_queue (target_friend);
+
+ return GNUNET_CONTAINER_multihashmap32_put (finger_hashmap,
+ new_entry->finger_map_index,
+ new_entry,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
}
/**
- * Core handler for P2P put messages.
- * @param cls closure
- * @param peer sender of the request
- * @param message message
- * @return #GNUNET_OK to keep the connection open,
- * #GNUNET_SYSERR to close it (signal serious error)
+ * Scan the trail to check if there is any other friend in the trail other than
+ * first hop. If yes then shortcut the trail, send trail compression message to
+ * peers which are no longer part of trail and send back the updated trail
+ * and trail_length to calling function.
+ * @param finger_identity Finger whose trail we will scan.
+ * @param finger_trail [in, out] Trail to reach from source to finger,
+ * @param finger_trail_length Total number of peers in original finger_trail.
+ * @param finger_trail_id Unique identifier of the finger trail.
+ * @return updated trail length in case we shortcut the trail, else original
+ * trail length.
*/
-static int
-handle_dht_p2p_put (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message)
+static int
+scan_and_compress_trail (struct GNUNET_PeerIdentity finger_identity,
+ struct GNUNET_PeerIdentity *trail,
+ unsigned int trail_length,
+ struct GNUNET_HashCode trail_id)
{
- struct PeerPutMessage *put;
- struct GNUNET_PeerIdentity *put_path;
- struct GNUNET_HashCode test_key;
- enum GNUNET_DHT_RouteOption options;
- struct GNUNET_PeerIdentity current_destination;
- struct GNUNET_PeerIdentity current_source;
- struct GNUNET_PeerIdentity *next_hop;
- void *payload;
- size_t msize;
- uint32_t putlen;
- size_t payload_size;
- uint64_t key_value;
-
- msize = ntohs (message->size);
- if (msize < sizeof (struct PeerPutMessage))
+ struct FriendInfo *target_friend;
+ int i;
+
+ if (0 == GNUNET_CRYPTO_cmp_peer_identity (&my_identity, &finger_identity))
{
- GNUNET_break_op (0);
- return GNUNET_YES;
+ return 0;
}
-
- put = (struct PeerPutMessage *) message;
- putlen = ntohl (put->put_path_length);
-
- if ((msize <
- sizeof (struct PeerPutMessage) +
- putlen * sizeof (struct GNUNET_PeerIdentity)) ||
- (putlen >
- GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)))
+
+ if (NULL != GNUNET_CONTAINER_multipeermap_get (friend_peermap, &finger_identity))
{
- GNUNET_break_op (0);
- return GNUNET_YES;
+ if (trail_length > 0)
+ {
+ target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+ &trail[0]);
+ GDS_NEIGHBOURS_send_trail_compression (my_identity, finger_identity,
+ trail_id, finger_identity,
+ target_friend);
+ trail = NULL;
+ }
+ return 0;
}
- current_destination = put->current_destination;
- current_source = put->current_source;
- put_path = (struct GNUNET_PeerIdentity *) &put[1];
- payload = &put_path[putlen];
- options = ntohl (put->options);
- payload_size = msize - (sizeof (struct PeerPutMessage) +
- putlen * sizeof (struct GNUNET_PeerIdentity));
-
- switch (GNUNET_BLOCK_get_key (GDS_block_context, ntohl (put->block_type),
- payload, payload_size, &test_key))
+ for (i = trail_length - 1; i > 0; i--)
{
- case GNUNET_YES:
- if (0 != memcmp (&test_key, &put->key, sizeof (struct GNUNET_HashCode)))
+ if (NULL != GNUNET_CONTAINER_multipeermap_get (friend_peermap, &trail[i]))
+ {
+ struct FriendInfo *target_friend;
+ int j = 0;
+
+ target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+ &trail[0]);
+ GDS_NEIGHBOURS_send_trail_compression (my_identity, finger_identity,
+ trail_id, trail[i],
+ target_friend);
+
+ // FIXME WARNING WARNING WARNING rewrite!!! consider directly creating a
+ // struct TrailList (current) // struct Trial (after renaming).
+
+ /* Copy the trail from index i to index trail_length -1 and change
+ trail length and return */
+ while (i < trail_length)
{
- char *put_s = GNUNET_strdup (GNUNET_h2s_full (&put->key));
- GNUNET_break_op (0);
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "PUT with key `%s' for block with key %s\n",
- put_s, GNUNET_h2s_full (&test_key));
- GNUNET_free (put_s);
- return GNUNET_YES;
+ memcpy (&trail[j], &trail[i], sizeof(struct GNUNET_PeerIdentity));
+ j++;
+ i++;
}
- break;
- case GNUNET_NO:
- GNUNET_break_op (0);
- return GNUNET_YES;
- case GNUNET_SYSERR:
- /* cannot verify, good luck */
+ trail_length = j+1;
break;
+ }
}
-
- if (ntohl (put->block_type) == GNUNET_BLOCK_TYPE_REGEX) /* FIXME: do for all tpyes */
+ return trail_length;
+}
+
+
+/**
+ * Send verify successor message to your successor on all trails to reach
+ * the successor.
+ * @param successor My current successor
+ */
+static void
+send_verify_successor_message (struct FingerInfo *successor)
+{
+ struct TrailList *trail_list_iterator;
+ struct GNUNET_HashCode trail_id;
+ struct GNUNET_PeerIdentity next_hop;
+ struct FriendInfo *target_friend;
+ struct GNUNET_PeerIdentity *trail;
+ unsigned int trail_length;
+ int i;
+ int j;
+
+ for (i = 0; i < MAXIMUM_TRAILS_PER_FINGER; i++)
{
- switch (GNUNET_BLOCK_evaluate (GDS_block_context,
- ntohl (put->block_type),
- NULL, /* query */
- NULL, 0, /* bloom filer */
- NULL, 0, /* xquery */
- payload, payload_size))
+ trail_list_iterator = &successor->trail_list[i];
+
+// FIXME check if this entry in the trail list is valid!
+// if (NULL == trail_list_iterator->SOMETHING)
+// continue;
+
+ if (trail_list_iterator->trail_length > 0)
{
- case GNUNET_BLOCK_EVALUATION_OK_MORE:
- case GNUNET_BLOCK_EVALUATION_OK_LAST:
- break;
+ struct Trail *element;
- case GNUNET_BLOCK_EVALUATION_OK_DUPLICATE:
- case GNUNET_BLOCK_EVALUATION_RESULT_INVALID:
- case GNUNET_BLOCK_EVALUATION_RESULT_IRRELEVANT:
- case GNUNET_BLOCK_EVALUATION_REQUEST_VALID:
- case GNUNET_BLOCK_EVALUATION_REQUEST_INVALID:
- case GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED:
- default:
- GNUNET_break_op (0);
- return GNUNET_OK;
+ trail_length = trail_list_iterator->trail_length;
+ trail = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity)
+ * trail_length);
+ element = trail_list_iterator->trail_head;
+ for (j = 0; j < trail_length; j++, element = element->next)
+ trail[j] = element->peer;
+ next_hop = trail_list_iterator->trail_head->peer;
}
- }
-
- struct GNUNET_PeerIdentity pp[putlen + 1];
- /* extend 'put path' by sender */
- /* FIXME: Check what are we doing here? */
- if (0 != (options & GNUNET_DHT_RO_RECORD_ROUTE))
- {
- memcpy (pp, put_path, putlen * sizeof (struct GNUNET_PeerIdentity));
- pp[putlen] = *peer;
- putlen++;
- }
- else
- putlen = 0;
-
- memcpy (&key_value, &(put->key), sizeof (uint64_t));
- if (0 != (GNUNET_CRYPTO_cmp_peer_identity (¤t_destination, &my_identity)))
- {
- GDS_ROUTING_print();
- next_hop = GDS_ROUTING_search (¤t_source, ¤t_destination, peer);
- if (next_hop == NULL)
+ else
{
- /* refer to handle_dht_p2p_trail_setup. */
+ trail = NULL;
+ trail_length = 0;
+ next_hop = successor->finger_identity;
}
+ trail_id = trail_list_iterator->trail_id;
+ target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &next_hop);
+ // check friend for NULL
+ GDS_NEIGHBOURS_send_verify_successor_message (my_identity,
+ successor->finger_identity,
+ trail_id, trail, trail_length,
+ target_friend);
+ GNUNET_free_non_null (trail);
}
- else
- {
- next_hop = find_successor (key_value, ¤t_destination, ¤t_source);
- }
-
- if (0 == GNUNET_CRYPTO_cmp_peer_identity(&my_identity, next_hop)) /* I am the final destination */
- {
- GDS_DATACACHE_handle_put (GNUNET_TIME_absolute_ntoh (put->expiration_time),
- &(put->key),putlen, pp, ntohl (put->block_type),
- payload_size, payload);
- return GNUNET_YES;
+}
+
+
+/**
+ * Check if there is already an entry in finger peermap for given finger map index.
+ * If yes, then select the closest finger. If new and existing finger are same,
+ * the check if you can store more trails. If yes then add trail, else keep the best
+ * trails to reach to the finger. If the new finger is closest, add it.
+ * Then, update current_search_finger_index.
+ * @param new_finger_identity Peer Identity of new finger
+ * @param new_finger_trail Trail to reach the new finger
+ * @param new_finger_length Total number of peers in @a new_finger_trail.
+ * @param finger_map_index Index in finger peermap.
+ * @param new_finger_trail_id Unique identifier of @new_finger_trail.
+ * @return #GNUNET_YES if the new entry is added
+ * #GNUNET_NO if new entry is not added, either it was discarded or
+ * it was same as existing finger at finger map index.
+ */
+static int
+finger_table_add (struct GNUNET_PeerIdentity new_finger_identity, // "finger_id"
+ struct GNUNET_PeerIdentity *new_finger_trail, // "trail"
+ unsigned int new_finger_trail_length,
+ unsigned int finger_map_index,
+ struct GNUNET_HashCode new_finger_trail_id)
+{
+ struct FingerInfo *existing_finger;
+ struct FingerInfo *successor;
+ unsigned int new_entry_added = GNUNET_NO;
+ int new_finger_updated_trail_length; // new_finger_trail_length
+
+ new_finger_updated_trail_length =
+ scan_and_compress_trail (new_finger_identity, new_finger_trail,
+ new_finger_trail_length, new_finger_trail_id);
+
+ existing_finger = GNUNET_CONTAINER_multihashmap32_get (finger_hashmap,
+ finger_map_index);
+
+ if (GNUNET_YES == is_new_finger_closest (existing_finger,
+ new_finger_identity,
+ new_finger_trail,
+ new_finger_updated_trail_length,
+ new_finger_trail_id, finger_map_index))
+ {
+ // send_destroy_existing_finger ...
+ // free_exisiting_finger ...
+ GNUNET_assert (GNUNET_YES == add_new_entry (new_finger_identity,
+ new_finger_trail,
+ new_finger_updated_trail_length,
+ new_finger_trail_id,
+ finger_map_index));
+ new_entry_added = GNUNET_YES;
}
- else
+// else if if_new_finger_equal () {
+//
+// }
+// else // existing finger is closest
+// {
+//
+// }
+
+ // FIXME move block to "update_succesor"
{
- GDS_CLIENTS_process_put (options,
- ntohl (put->block_type),
- ntohl (put->hop_count),
- ntohl (put->desired_replication_level),
- putlen, pp,
- GNUNET_TIME_absolute_ntoh (put->expiration_time),
- &put->key,
- payload,
- payload_size);
-
- GDS_NEIGHBOURS_send_put (&put->key, payload, payload_size,
- ntohl (put->block_type),ntohl (put->options),
- ntohl (put->desired_replication_level),
- GNUNET_TIME_absolute_ntoh (put->expiration_time),
- current_destination, current_source, next_hop,
- ntohl (put->hop_count), putlen, pp);
-
- return GNUNET_YES;
+ successor = GNUNET_CONTAINER_multihashmap32_get (finger_hashmap, 0);
+ // WARNING FIXME check that current_search_finger_index does not go out of bounds
+ if (0 == finger_map_index)
+ {
+ current_search_finger_index = PREDECESSOR_FINGER_ID;
+
+ if (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_identity, &new_finger_identity))
+ {
+ send_verify_successor_message (successor);
+ }
+ }
+ else if (0 == GNUNET_CRYPTO_cmp_peer_identity (&new_finger_identity,
+ &(successor->finger_identity)))
+ {
+ current_search_finger_index = 0;
+ }
+ else
+ current_search_finger_index = current_search_finger_index - 1;
}
- return GNUNET_SYSERR;
+
+ return new_entry_added;
+}
+
+
+/**
+ * Core handler for P2P put messages.
+ * @param cls closure
+ * @param peer sender of the request
+ * @param message message
+ * @return #GNUNET_OK to keep the connection open,
+ * #GNUNET_SYSERR to close it (signal serious error)
+ */
+static int
+handle_dht_p2p_put (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message)
+{
+ return GNUNET_OK;
}
handle_dht_p2p_get (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message)
{
- struct PeerGetMessage *get;
- struct GNUNET_PeerIdentity *get_path;
- struct GNUNET_PeerIdentity current_destination;
- struct GNUNET_PeerIdentity current_source;
- struct GNUNET_PeerIdentity *next_hop;
- uint32_t get_length;
- uint64_t key_value;
- size_t msize;
-
- msize = ntohs (message->size);
- if (msize < sizeof (struct PeerGetMessage))
- {
- GNUNET_break_op (0);
- return GNUNET_YES;
- }
-
- get = (struct PeerGetMessage *)message;
- get_length = ntohl (get->get_path_length);
- get_path = (struct GNUNET_PeerIdentity *)&get[1];
- current_destination = get->current_destination;
- current_source = get->current_source;
-
- if ((msize <
- sizeof (struct PeerGetMessage) +
- get_length * sizeof (struct GNUNET_PeerIdentity)) ||
- (get_length >
- GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)))
- {
- GNUNET_break_op (0);
- return GNUNET_YES;
- }
-
- /* Add sender to get path */
- struct GNUNET_PeerIdentity gp[get_length + 1];
- memcpy (gp, get_path, get_length * sizeof (struct GNUNET_PeerIdentity));
- gp[get_length + 1] = *peer;
- get_length = get_length + 1;
-
- memcpy (&key_value, &(get->key), sizeof (uint64_t));
- if (0 != (GNUNET_CRYPTO_cmp_peer_identity (¤t_destination, &my_identity)))
- {
- GDS_ROUTING_print();
- next_hop = GDS_ROUTING_search (¤t_source, ¤t_destination, peer);
- if (next_hop == NULL)
- {
- /* refer to handle_dht_p2p_trail_setup. */
- }
- }
- else
- {
- next_hop = find_successor (key_value, ¤t_destination, ¤t_source);
- }
-
- if (0 == GNUNET_CRYPTO_cmp_peer_identity(&my_identity, next_hop))
- {
- /* I am the destination.*/
- struct GNUNET_PeerIdentity final_get_path[get_length+1];
- struct GNUNET_PeerIdentity next_hop;
-
- memcpy (final_get_path, gp, get_length * sizeof (struct GNUNET_PeerIdentity));
- memcpy (&final_get_path[get_length+1], &my_identity, sizeof (struct GNUNET_PeerIdentity));
- get_length = get_length + 1;
- memcpy (&next_hop, &final_get_path[get_length-2], sizeof (struct GNUNET_PeerIdentity));
-
- GDS_DATACACHE_handle_get (&(get->key),(get->block_type), NULL, 0, NULL, 0,
- get_length, final_get_path,&next_hop, &my_identity);
-
- return GNUNET_YES;
- }
- else
- {
- GDS_NEIGHBOURS_send_get (&(get->key), get->block_type, get->options,
- get->desired_replication_level,current_destination,
- current_source, next_hop, 0,
- get_length, gp);
- }
- return GNUNET_SYSERR;
+ return GNUNET_OK;
}
/**
- * FIXME: In case of trail, we don't have source and destination part of the trail,
- * Check if we follow the same in case of get/put/get_result. Also, in case of
- * put should we do a routing table add.
* Core handler for get result
* @param cls closure
* @param peer sender of the request
handle_dht_p2p_get_result (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message)
{
- struct PeerGetResultMessage *get_result;
- struct GNUNET_PeerIdentity *get_path;
- struct GNUNET_PeerIdentity *put_path;
- void *payload;
- size_t payload_size;
- size_t msize;
- unsigned int getlen;
- unsigned int putlen;
- int current_path_index;
-
- msize = ntohs (message->size);
- if (msize < sizeof (struct PeerGetResultMessage))
- {
- GNUNET_break_op (0);
- return GNUNET_YES;
- }
-
- get_result = (struct PeerGetResultMessage *)message;
- getlen = ntohl (get_result->get_path_length);
- putlen = ntohl (get_result->put_path_length);
-
- if ((msize <
- sizeof (struct PeerGetResultMessage) +
- getlen * sizeof (struct GNUNET_PeerIdentity) +
- putlen * sizeof (struct GNUNET_PeerIdentity)) ||
- (getlen >
- GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity) ||
- (putlen >
- GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity))))
- {
- GNUNET_break_op (0);
- return GNUNET_YES;
- }
-
- get_path = (struct GNUNET_PeerIdentity *) &get_result[1];
- payload = &get_path[getlen];
- payload_size = msize - (sizeof (struct PeerGetResultMessage) +
- getlen * sizeof (struct GNUNET_PeerIdentity));
- /* FIXME: Check if its correct or not. */
-
- if (putlen > 0)
- put_path = &get_path[1];
- else
- put_path = NULL;
-
- if (0 == (GNUNET_CRYPTO_cmp_peer_identity (&my_identity, &(get_path[0]))))
- {
- //GDS_CLIENTS_process_get_result();
- GDS_CLIENTS_handle_reply (get_result->expiration_time, &(get_result->key),
- getlen, get_path, putlen,
- put_path, get_result->type, payload_size, payload);
- return GNUNET_YES;
- }
- else
- {
- struct GNUNET_PeerIdentity *next_hop;
- next_hop = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity));
- /* FIXME: handle the case when current_path_index = GNUNET_SYSERR;*/
- current_path_index = search_my_index (get_path, getlen);
- /* FIXME: First check if you are adding yourself to the get path or not.
- if yes then don't check if current_path_index == 0, if not then check
- and next_hop == source_peer. */
- memcpy (next_hop, &get_path[current_path_index - 1], sizeof (struct GNUNET_PeerIdentity));
-
- GDS_NEIGHBOURS_send_get_result (get_result->expiration_time, &(get_result->key),
- putlen, put_path,
- get_result->type, payload_size,payload,
- get_path, getlen,
- next_hop, &(get_result->source_peer));
- return GNUNET_YES;
- }
- return GNUNET_SYSERR;
+ return GNUNET_OK;
}
-/**
- * FIXME: Is all trails threshold and routing table has some link.
- * Core handle for PeerTrailSetupMessage.
+/* Core handle for PeerTrailSetupMessage.
* @param cls closure
* @param message message
* @param peer peer identity this notification is about
handle_dht_p2p_trail_setup (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message)
{
- const struct PeerTrailSetupMessage *trail_setup;
- struct GNUNET_PeerIdentity current_destination;
- struct GNUNET_PeerIdentity current_source;
- struct GNUNET_PeerIdentity source;
+ struct PeerTrailSetupMessage *trail_setup;
+ struct GNUNET_PeerIdentity *trail_peer_list;
+ struct GNUNET_PeerIdentity next_destination; // "local_best_known_destination"
+ struct GNUNET_PeerIdentity *current_destination;
struct GNUNET_PeerIdentity *next_hop;
struct GNUNET_PeerIdentity next_peer;
- struct GNUNET_PeerIdentity *trail_peer_list;
struct FriendInfo *target_friend;
- uint64_t destination_finger_value;
+ struct GNUNET_PeerIdentity source;
+ uint64_t ultimate_destination_finger_value;
+ struct GNUNET_HashCode new_intermediate_trail_id;
+ //struct GNUNET_HashCode *intermediate_trail_id;
+ struct GNUNET_HashCode new_trail_id;
+ unsigned int finger_map_index;
uint32_t trail_length;
- uint32_t finger_map_index;
size_t msize;
msize = ntohs (message->size);
+ /* There are PeerId's appended to the end of the message! */
if (msize < sizeof (struct PeerTrailSetupMessage))
{
GNUNET_break_op (0);
return GNUNET_YES;
}
-
- trail_setup = (const struct PeerTrailSetupMessage *) message;
- trail_length = ntohl (trail_setup->trail_length);
-
- if ((msize < sizeof (struct PeerTrailSetupMessage) +
+
+ trail_setup = (struct PeerTrailSetupMessage *) message;
+ trail_length = ntohl (trail_setup->trail_length); // (msize - sizeof (msg)) / sizeof(PI)
+ // if ((msize - sizeof (msg)) % sizeof(PI) != 0)
+ if ((msize != sizeof (struct PeerTrailSetupMessage) +
trail_length * sizeof (struct GNUNET_PeerIdentity)) ||
(trail_length >
GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)))
{
GNUNET_break_op (0);
- return GNUNET_OK;
+ return GNUNET_OK;
}
-
- if (trail_length > 0)
- trail_peer_list = (struct GNUNET_PeerIdentity *)&trail_setup[1];
- memcpy (¤t_destination, &(trail_setup->current_destination), sizeof (struct GNUNET_PeerIdentity));
- memcpy (¤t_source,&(trail_setup->current_source), sizeof (struct GNUNET_PeerIdentity));
- memcpy (&source, &(trail_setup->source_peer), sizeof (struct GNUNET_PeerIdentity));
+
+ trail_peer_list = (struct GNUNET_PeerIdentity *)&trail_setup[1];
+ current_destination = &trail_setup->next_destination;
+ new_trail_id = trail_setup->new_trail_id;
+ ultimate_destination_finger_value = GNUNET_ntohll (trail_setup->ultimate_destination_finger);
+ source = trail_setup->source_peer;
finger_map_index = ntohl (trail_setup->finger_map_index);
- destination_finger_value = ntohl (trail_setup->destination_finger);
+ //intermediate_trail_id = &trail_setup->intermediate_trail_id;
-#if 0
- /* FIXME: Here we need to check 3 things
- * 1. if my routing table is all full
- * 2. if all my friends are congested
- * 3. if trail threshold of my friends have crossed.
- * In all these cases we need to send back trail rejection message. */
- if ( (GNUNET_YES == all_friends_trail_threshold)
- || (GNUNET_YES == GDS_ROUTING_check_threshold()))
+ if (GNUNET_YES == GDS_ROUTING_threshold_reached())
{
- /* If all the friends have reached their trail threshold or if there is no
- more space in routing table to store more trails, then reject. */
- GDS_NEIGHBOURS_send_trail_rejection (&source, destination_finger_value, &my_identity,
- peer,finger_map_index, trail_peer_list,trail_length);
+ target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, peer);
+ GDS_NEIGHBOURS_send_trail_rejection (source, ultimate_destination_finger_value,
+ my_identity, finger_map_index,
+ trail_peer_list, trail_length,
+ new_trail_id, target_friend,
+ CONGESTION_TIMEOUT);
return GNUNET_OK;
}
-#endif
-
-
- /* Check if you are current_destination or not. */
- if (0 != (GNUNET_CRYPTO_cmp_peer_identity (¤t_destination, &my_identity)))
- {
- GDS_ROUTING_print();
- next_hop = GDS_ROUTING_search (¤t_source, ¤t_destination, peer);
- /* OPTIMIZATION: Choose a peer from find_successor and choose the closest one.
- In case the closest one is from routing table and it is NULL, then update
- statistics. */
- if (next_hop == NULL)
- {
- /* FIXME: Should we inform the peer before us. If not then it may continue
- to send us request. But in case we want to inform we need to have a
- different kind of message. */
- GNUNET_STATISTICS_update (GDS_stats,
- gettext_noop ("# Trail not found in routing table during"
- "trail setup request, packet dropped."),
- 1, GNUNET_NO);
- return GNUNET_OK;
- }
- }
- else
- {
- next_hop = find_successor (destination_finger_value, ¤t_destination, ¤t_source);
- }
-
- if (NULL == next_hop)
- {
- return GNUNET_SYSERR;
- }
- else if (0 == (GNUNET_CRYPTO_cmp_peer_identity (next_hop, &my_identity)))/* This means I am the final destination */
- {
- if (trail_length == 0)
- {
+
+ next_hop = find_successor (ultimate_destination_finger_value, &next_destination,
+ &new_intermediate_trail_id, finger_map_index);
+
+ /* Are we just a part of a trail towards a finger? */
+ if (0 != (GNUNET_CRYPTO_cmp_peer_identity(&my_identity, current_destination)))
+ {
+// struct GNUNET_PeerIdentity *closest_peer;
+// struct GNUNET_PeerIdentity *peer1 =
+// GDS_ROUTING_get_next_hop (intermediate_trail_id,
+// GDS_ROUTING_SRC_TO_DEST);
+ /* Is next_destination better than the original best_known_dest? */
+ // BIG FIXME START
+// if (0 != GNUNET_CRYPTO_cmp_peer_identity (next_destination,
+// current_destination))
+// {
+// closest_peer = select_closest_peer (peer1, next_hop,
+// ultimate_destination_finger_value,
+// finger_map_index);
+// }
+// if (0 == GNUNET_CRYPTO_cmp_peer_identity (peer1, closest_peer) ||
+// (0 == GNUNET_CRYPTO_cmp_peer_identity (peer1, next_hop)))
+// {
+// next_hop = peer1;
+// next_destination = *current_destination;
+// new_intermediate_trail_id = intermediate_trail_id;
+// }
+ // BIG FIXME END
+ }
+
+ GNUNET_assert (NULL != next_hop);
+ /* Am I the final destination? */
+ if (0 == (GNUNET_CRYPTO_cmp_peer_identity (next_hop, &my_identity)))
+ {
+ if (0 == trail_length)
memcpy (&next_peer, &source, sizeof (struct GNUNET_PeerIdentity));
- }
else
- {
memcpy (&next_peer, &trail_peer_list[trail_length-1], sizeof (struct GNUNET_PeerIdentity));
- }
-
+
target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &next_peer);
- /* ! HAVE A PREDECESSOR || (source_peer closer than existing PREDECESOR) */
- if (PREDECESSOR_FINGER_ID != finger_map_index)
- {
- /* FIXME: Is this correct assumption? A peer which think I am its predecessor,
- then I am not its predecessor. */
- compare_and_update_predecessor (&source, trail_peer_list, trail_length );
- }
- GDS_NEIGHBOURS_send_trail_setup_result (&source,
- &(my_identity),
+ GDS_NEIGHBOURS_send_trail_setup_result (source,
+ my_identity,
target_friend, trail_length,
trail_peer_list,
- finger_map_index);
- return GNUNET_OK;
+ finger_map_index, new_trail_id);
}
else
{
- /* Now add yourself to the trail. */
struct GNUNET_PeerIdentity peer_list[trail_length + 1];
- if (trail_length != 0)
- memcpy (peer_list, trail_peer_list, trail_length * sizeof (struct GNUNET_PeerIdentity));
+
+ memcpy (peer_list, trail_peer_list, trail_length * sizeof (struct GNUNET_PeerIdentity));
peer_list[trail_length] = my_identity;
- trail_length++;
target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, next_hop);
- GDS_NEIGHBOURS_send_trail_setup (&source,
- destination_finger_value,
- ¤t_destination, ¤t_source,
- target_friend, trail_length, peer_list,
- finger_map_index);
- return GNUNET_OK;
+ GDS_NEIGHBOURS_send_trail_setup (source,
+ ultimate_destination_finger_value,
+ next_destination,
+ target_friend, trail_length + 1, peer_list,
+ finger_map_index, new_trail_id,
+ &new_intermediate_trail_id);
}
+ return GNUNET_OK;
}
handle_dht_p2p_trail_setup_result(void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message)
{
- const struct PeerTrailSetupResultMessage *trail_result;
+ struct PeerTrailSetupResultMessage *trail_result;
struct GNUNET_PeerIdentity *trail_peer_list;
+ struct GNUNET_PeerIdentity destination_peer;
+ struct GNUNET_PeerIdentity finger_identity;
uint32_t trail_length;
uint32_t finger_map_index;
+ struct GNUNET_HashCode trail_id;
size_t msize;
-
+
msize = ntohs (message->size);
if (msize < sizeof (struct PeerTrailSetupResultMessage))
{
GNUNET_break_op (0);
return GNUNET_YES;
}
-
- trail_result = (const struct PeerTrailSetupResultMessage *) message;
- trail_length = ntohl (trail_result->trail_length);
-
- if ((msize <
+
+ trail_result = (struct PeerTrailSetupResultMessage *) message;
+
+ // calculate trail_length with message size, check for % 0
+ trail_length = ntohl (trail_result->trail_length);
+ if ((msize !=
sizeof (struct PeerTrailSetupResultMessage) +
trail_length * sizeof (struct GNUNET_PeerIdentity)) ||
(trail_length >
GNUNET_break_op (0);
return GNUNET_YES;
}
-
+
finger_map_index = htonl (trail_result->finger_map_index);
+ destination_peer = trail_result->destination_peer;
+ finger_identity = trail_result->finger_identity;
+ trail_id = trail_result->trail_id;
trail_peer_list = (struct GNUNET_PeerIdentity *) &trail_result[1];
-
- if (0 == (GNUNET_CRYPTO_cmp_peer_identity (&(trail_result->destination_peer),
+
+ // FIXME: check that trail_peer_list[my_index + 1] == peer or
+ // my_index == trail_length - 1 AND finger_identity == peer
+
+ /* Am I the one who initiated the query? */
+ if (0 == (GNUNET_CRYPTO_cmp_peer_identity (&destination_peer,
&my_identity)))
{
- finger_table_add (&(trail_result->finger_identity), trail_peer_list, trail_length,
- finger_map_index);
+ finger_table_add (finger_identity, trail_peer_list,
+ trail_length,
+ finger_map_index, trail_id);
return GNUNET_YES;
}
- else
+
+ struct GNUNET_PeerIdentity next_hop;
+ struct FriendInfo *target_friend;
+ int my_index;
+
+ my_index = search_my_index(trail_peer_list, trail_length);
+ if (-1 == my_index)
{
- struct GNUNET_PeerIdentity next_hop;
- struct FriendInfo *target_friend;
- int my_index;
-
- my_index = search_my_index (trail_peer_list, trail_length);
- if (my_index == GNUNET_SYSERR)
- return GNUNET_SYSERR;
-
- if (my_index == 0)
- {
- next_hop = trail_result->destination_peer;
- }
- else
- next_hop = trail_peer_list[my_index - 1];
-
- /* Finger table of destination peer will not contain any trail for the case
- * where destination peer is its own finger identity.*/
- if (0 != (GNUNET_CRYPTO_cmp_peer_identity (&(trail_result->destination_peer),
+ GNUNET_break_op(0);
+ return GNUNET_SYSERR;
+ }
+
+
+ if (my_index == 0)
+ next_hop = trail_result->destination_peer;
+ else
+ next_hop = trail_peer_list[my_index - 1];
+
+ if (0 != (GNUNET_CRYPTO_cmp_peer_identity (&(trail_result->destination_peer),
&(trail_result->finger_identity))))
- {
- /* FIXME: First call GDS_ROUTING_search, only if it returns NULL, call
- GDS_ROUTING_add. But in case we have same 3 fields but 1 different next hop
- then we should add the entry but in current implementation of GDS_ROUTNG_search
- we don't handle it. */
- GDS_ROUTING_add (&(trail_result->destination_peer), &(trail_result->finger_identity),
- peer, &next_hop);
- GDS_ROUTING_print();
- }
-
- target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &next_hop);
- GDS_NEIGHBOURS_send_trail_setup_result (&(trail_result->destination_peer),
- &(trail_result->finger_identity),
- target_friend, trail_length,
- trail_peer_list,
- finger_map_index);
- return GNUNET_YES;
+ {
+ GDS_ROUTING_add (trail_id, next_hop, *peer);
}
- return GNUNET_SYSERR;
+
+ target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &next_hop);
+ GDS_NEIGHBOURS_send_trail_setup_result (destination_peer, finger_identity,
+ target_friend, trail_length, trail_peer_list,
+ finger_map_index, trail_id);
+ return GNUNET_OK;
}
/**
- * Get my current predecessor from the finger peer map
- * @return Current predecessor.
+ * Invert the trail.
+ * @param trail Trail to be inverted
+ * @param trail_length Total number of peers in the trail.
+ * @return Updated trail
*/
-static struct FingerInfo *
-get_predecessor()
+static struct GNUNET_PeerIdentity *
+invert_trail (struct GNUNET_PeerIdentity *trail,
+ unsigned int trail_length)
{
- struct GNUNET_CONTAINER_MultiPeerMapIterator *finger_iter;
- struct GNUNET_PeerIdentity key_ret;
- unsigned int finger_index;
- struct FingerInfo *my_predecessor;
- int flag = 0;
-
- /* Iterate over finger peer map and extract your predecessor. */
- finger_iter = GNUNET_CONTAINER_multipeermap_iterator_create (finger_peermap);
- for (finger_index = 0; finger_index < GNUNET_CONTAINER_multipeermap_size (finger_peermap); finger_index++)
+ int i;
+ int j;
+ struct GNUNET_PeerIdentity *inverted_trail;
+
+ inverted_trail = GNUNET_malloc (sizeof(struct GNUNET_PeerIdentity) *
+ trail_length);
+ i = 0;
+ j = trail_length - 1;
+ while (i < trail_length)
{
- if(GNUNET_YES == GNUNET_CONTAINER_multipeermap_iterator_next
- (finger_iter,&key_ret,(const void **)&my_predecessor))
- {
- if(PREDECESSOR_FINGER_ID == my_predecessor->finger_map_index)
- {
- flag = 1;
- break;
- }
- }
+ inverted_trail[i] = trail[j];
+ i++;
+ j--;
}
- GNUNET_CONTAINER_multipeermap_iterator_destroy (finger_iter);
-
- if (0 == flag)
- return NULL;
- else
- return my_predecessor;
+ return inverted_trail;
+}
+
+
+/**
+ * Check if the new finger can be our predecessor. If yes then update predecessor
+ *
+ * @param new_finger
+ * @param new_finger_trail
+ * @param new_finger_trail_length
+ * @return
+ */
+static int
+is_new_entry_correct_predecessor (struct FingerInfo *my_predecessor,
+ struct GNUNET_PeerIdentity new_finger,
+ struct GNUNET_PeerIdentity *new_finger_trail,
+ unsigned int new_finger_trail_length)
+{
+ struct GNUNET_PeerIdentity *updated_trail;
+ struct GNUNET_HashCode new_trail_id;
+
+ updated_trail = invert_trail (new_finger_trail, new_finger_trail_length);
+ if (GNUNET_YES == is_new_finger_closest (my_predecessor, new_finger,
+ new_finger_trail,
+ new_finger_trail_length,
+ new_trail_id, PREDECESSOR_FINGER_ID))
+ {
+ add_new_entry (new_finger, updated_trail, new_finger_trail_length,
+ new_trail_id, PREDECESSOR_FINGER_ID);
+ /* FIXME: check where you send add trail message */
+ return GNUNET_YES;
+ }
+ return GNUNET_NO;
+}
+
+/**
+ * In case the source peer of verify successor message is not my successor,
+ * then construct a trail from source peer to my current predecessor.
+ * @param my_predecessor my current predecessor.
+ * @param current_trail Trail from source to me.
+ * @param current_trail_length Total number of peers in @a current_trail
+ * @param new_trail_length [out] Total number of peers in updated trail.
+ * @return Updated trail from source peer to my_predecessor.
+ */
+static struct GNUNET_PeerIdentity *
+trail_source_to_my_predecessor (struct FingerInfo *my_predecessor,
+ struct GNUNET_PeerIdentity *current_trail,
+ unsigned int current_trail_length,
+ unsigned int *new_trail_length)
+{
+ struct GNUNET_PeerIdentity *new_trail;
+ struct TrailList *trail_list_iterator;
+ struct Trail *trail_iterator;
+ unsigned int i;
+ unsigned int j;
+ unsigned int shortest_trail_length = 0;
+ unsigned int trail_index = 0;
+
+ for (i = 0; i < my_predecessor->trails_count; i++)
+ {
+ trail_list_iterator = &my_predecessor->trail_list[i];
+ if (trail_list_iterator->trail_length > shortest_trail_length)
+ continue;
+ shortest_trail_length = trail_list_iterator->trail_length;
+ trail_index = i;
+ }
+
+ *new_trail_length = current_trail_length + shortest_trail_length + 1;
+ new_trail = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity) *
+ *new_trail_length);
+ memcpy (new_trail, current_trail,
+ current_trail_length * sizeof (struct GNUNET_PeerIdentity));
+ new_trail[current_trail_length + 1] = my_identity;
+
+ i = 0;
+ j = current_trail_length + 1;
+ trail_list_iterator = &my_predecessor->trail_list[trail_index];
+ trail_iterator = trail_list_iterator->trail_head;
+ while ( i < shortest_trail_length)
+ {
+ new_trail[j] = trail_iterator->peer;
+ j++;
+ i++;
+ trail_iterator = trail_iterator->next;
+ }
+
+ *new_trail_length = j;
+ return new_trail;
}
handle_dht_p2p_verify_successor(void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message)
{
- const struct PeerVerifySuccessorMessage *vsm;
- const struct GNUNET_PeerIdentity *trail_peer_list;
+ struct PeerVerifySuccessorMessage *vsm;
+ struct GNUNET_PeerIdentity successor;
struct GNUNET_PeerIdentity source_peer;
- struct GNUNET_PeerIdentity next_hop;
+ struct GNUNET_PeerIdentity *next_hop;
struct FriendInfo *target_friend;
+ struct GNUNET_HashCode trail_id;
+ struct FingerInfo *my_predecessor;
+ struct GNUNET_PeerIdentity *trail;
+ struct GNUNET_PeerIdentity *new_trail;
+ unsigned int trail_length;
+ unsigned int new_trail_length;
size_t msize;
- uint32_t trail_length;
-
+
msize = ntohs (message->size);
- if (msize < sizeof (struct PeerVerifySuccessorMessage))
+ if (msize != sizeof (struct PeerVerifySuccessorMessage))
{
GNUNET_break_op (0);
return GNUNET_YES;
}
-
+
vsm = (struct PeerVerifySuccessorMessage *) message;
trail_length = ntohl (vsm->trail_length);
-
- if ((msize < sizeof (struct PeerVerifySuccessorMessage) +
+ if ((msize != sizeof (struct PeerVerifySuccessorMessage) +
trail_length * sizeof (struct GNUNET_PeerIdentity)) ||
(trail_length > GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)))
{
GNUNET_break_op (0);
return GNUNET_YES;
}
- if (trail_length > 0)
- trail_peer_list = (const struct GNUNET_PeerIdentity *)&vsm[1];
- memcpy (&source_peer, &(vsm->source_peer), sizeof(struct GNUNET_PeerIdentity));
-
- if(0 == (GNUNET_CRYPTO_cmp_peer_identity (&(vsm->successor),&my_identity)))
+ trail = (struct GNUNET_PeerIdentity *)&vsm[1];
+ source_peer = vsm->source_peer;
+ successor = vsm->successor;
+ trail_id = vsm->trail_id;
+
+ if(0 != (GNUNET_CRYPTO_cmp_peer_identity (&successor, &my_identity)))
{
- struct FingerInfo *my_predecessor;
- if (trail_length == 0)
- {
- /* SUPU: If I am friend of source_peer, then trail_length == 0. */
- memcpy (&next_hop, &source_peer, sizeof (struct GNUNET_PeerIdentity));
- }
- else
- {
- /* SUPU: Here I am the final destination successor, and trail does not contain
- destination. So, the next hop is the last element in the trail. */
- memcpy (&next_hop, &trail_peer_list[trail_length-1], sizeof (struct GNUNET_PeerIdentity));
- }
- target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &next_hop);
-
- my_predecessor = get_predecessor();
- if (NULL == my_predecessor)
+ next_hop = GDS_ROUTING_get_next_hop (trail_id, GDS_ROUTING_SRC_TO_DEST);
+ if (NULL == next_hop)
{
- GNUNET_break(0);
+ GNUNET_break (0);
return GNUNET_SYSERR;
}
-
- if (0 == (GNUNET_CRYPTO_cmp_peer_identity (&source_peer,
- &(my_predecessor->finger_identity))))
+ target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, next_hop);
+ GDS_NEIGHBOURS_send_verify_successor_message (source_peer, successor,
+ trail_id, trail, trail_length,
+ target_friend);
+ return GNUNET_OK;
+ }
+
+ my_predecessor = GNUNET_CONTAINER_multihashmap32_get (finger_hashmap,
+ PREDECESSOR_FINGER_ID);
+ target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, peer);
+ if (GNUNET_NO == is_new_entry_correct_predecessor (my_predecessor, source_peer,
+ trail, trail_length))
+ {
+ if (0 != GNUNET_CRYPTO_cmp_peer_identity (&source_peer,
+ &my_predecessor->finger_identity))
{
- /* Source peer and my predecessor, both are same. */
- GDS_NEIGHBOURS_send_verify_successor_result (&source_peer,
- &(my_identity),
- &(my_predecessor->finger_identity),
- target_friend,
- trail_peer_list,
- trail_length);
+ new_trail = trail_source_to_my_predecessor (my_predecessor, trail,
+ trail_length, &new_trail_length);
}
- else
- {
- struct GNUNET_PeerIdentity *new_successor_trail;
- struct TrailPeerList *iterator;
- int new_trail_length;
- int i;
-
- new_trail_length = trail_length + my_predecessor->first_trail_length + 1;
- new_successor_trail = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity) * new_trail_length);
- if (trail_length > 0)
- memcpy (new_successor_trail, trail_peer_list, (trail_length) * sizeof (struct GNUNET_PeerIdentity));
-
- memcpy (&new_successor_trail[trail_length], &my_identity, sizeof (struct GNUNET_PeerIdentity));
-
- if (my_predecessor->first_trail_length)
- {
- iterator = GNUNET_malloc (sizeof (struct TrailPeerList));
- iterator = my_predecessor->first_trail_head;
- i = trail_length + 1;
- while (i < new_trail_length)
- {
- memcpy (&new_successor_trail[i], &(iterator->peer), sizeof (struct GNUNET_PeerIdentity));
- iterator = iterator->next;
- i++;
- }
- }
- GDS_NEIGHBOURS_send_verify_successor_result (&source_peer,
- &(my_identity),
- &(my_predecessor->finger_identity),
- target_friend,
- new_successor_trail,
- new_trail_length);
- }
-
}
else
{
- int my_index;
-
- if (trail_length == 0)
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
-
- my_index = search_my_index (trail_peer_list, trail_length);
- if (my_index == GNUNET_SYSERR)
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- if (my_index == (trail_length - 1))
- {
- target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &(vsm->successor));
- }
- else
- {
- memcpy (&next_hop, &trail_peer_list[my_index + 1], sizeof (struct GNUNET_PeerIdentity));
- target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &next_hop);
- }
-
- GDS_NEIGHBOURS_send_verify_successor (&(vsm->source_peer), &(vsm->successor),target_friend,
- trail_peer_list, trail_length);
- }
- return GNUNET_SYSERR;
+ my_predecessor = GNUNET_CONTAINER_multihashmap32_get (finger_hashmap,
+ PREDECESSOR_FINGER_ID);
+ GDS_NEIGHBOURS_send_add_trail (my_predecessor->finger_identity,
+ source_peer, trail_id,
+ trail, trail_length,
+ target_friend);
+ new_trail_length = trail_length;
+ new_trail = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity) *
+ new_trail_length);
+ memcpy (new_trail, trail, sizeof (struct GNUNET_PeerIdentity) *
+ trail_length);
+ }
+
+ GDS_NEIGHBOURS_send_verify_successor_result (source_peer, my_identity,
+ my_predecessor->finger_identity,
+ trail_id, new_trail,
+ new_trail_length,
+ GDS_ROUTING_DEST_TO_SRC,
+ target_friend);
+ return GNUNET_OK;
}
-/**FIXME: in case we have a new successor do we need to update the entries in
- * routing table to change the destination of the message from old successor
- * to new successor or when the old successor sends the message the I am not
- * your successor then it sends a trail teardown message across the old trail.
- * Need to decide on a strategy.
+/**
+ * FIXME: I will keep the logic to remove the old trail to reach from me to
+ * my old successor here and move adding a new trail from me to new successor to notify
+ * new successor. And in case if the new successor also take it as predecessor
+ * then call add_trail.
* Core handle for p2p verify successor result messages.
* @param cls closure
* @param message message
handle_dht_p2p_verify_successor_result(void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message)
{
- const struct PeerVerifySuccessorResultMessage *vsrm;
- struct GNUNET_PeerIdentity *trail_peer_list;
- struct GNUNET_PeerIdentity next_hop;
+ struct PeerVerifySuccessorResultMessage *vsrm;
+ enum GDS_ROUTING_trail_direction trail_direction;
+ struct GNUNET_HashCode trail_id;
+ unsigned int new_trail_length;
+ struct GNUNET_PeerIdentity *new_trail;
+ struct GNUNET_PeerIdentity destination_peer;
+ struct GNUNET_PeerIdentity my_new_successor;
+ struct GNUNET_PeerIdentity old_successor;
+ struct GNUNET_PeerIdentity *next_hop;
struct FriendInfo *target_friend;
size_t msize;
- uint32_t trail_length;
-
+
msize = ntohs (message->size);
- if (msize < sizeof (struct PeerVerifySuccessorResultMessage))
+ if (msize != sizeof (struct PeerVerifySuccessorResultMessage))
{
GNUNET_break_op (0);
return GNUNET_YES;
}
- vsrm = (const struct PeerVerifySuccessorResultMessage *) message;
- trail_length = ntohl (vsrm->trail_length);
-
- if ((msize <
+ vsrm = (struct PeerVerifySuccessorResultMessage *) message;
+ new_trail_length = ntohl (vsrm->trail_length);
+ trail_direction = ntohl (vsrm->trail_direction);
+ trail_id = vsrm->trail_id;
+
+ if ((msize !=
sizeof (struct PeerVerifySuccessorResultMessage) +
- trail_length * sizeof (struct GNUNET_PeerIdentity)) ||
- (trail_length >
+ new_trail_length *
+ sizeof (struct GNUNET_PeerIdentity)) ||
+ (new_trail_length >
GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)))
- {
- GNUNET_break_op (0);
- return GNUNET_YES;
- }
- /* FIXME: URGENT: What happens when trail length = 0. */
-
- trail_peer_list = (struct GNUNET_PeerIdentity *) &vsrm[1];
-
- if(0 == (GNUNET_CRYPTO_cmp_peer_identity (&(vsrm->destination_peer), &(my_identity))))
- {
- if(0 != (GNUNET_CRYPTO_cmp_peer_identity (&(vsrm->my_predecessor), &(my_identity))))
- {
- /* FIXME: Here we have got a new successor. But it may happen that our logic
- * says that this is not correct successor. so in finger table add it
- * failed to update the successor and we are still sending a notify
- * new successor. Here trail_length will be atleast 1, in case we have a new
- * successor because in that case our old successor is part of trail.
- * Could it be possible that our identity and my_predecessor is same. Check it. */
- if (GNUNET_YES == finger_table_add (&(vsrm->my_predecessor), trail_peer_list, trail_length, 0))
- {
- memcpy (&next_hop, &trail_peer_list[0], sizeof (struct GNUNET_PeerIdentity));
- target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &next_hop);
- GDS_NEIGHBOURS_send_notify_new_successor (&my_identity, &(vsrm->my_predecessor),
- target_friend, trail_peer_list,
- trail_length);
- return GNUNET_OK;
- }
- /*else
- {
-
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }*/
- }
- }
- else
- {
- int my_index;
-
- my_index = search_my_index (trail_peer_list, trail_length);
- if (GNUNET_SYSERR == my_index)
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
-
- if (my_index == 0)
- {
- /* Source is not part of trail, so if I am the last one then my index
- should be 0. */
- memcpy (&next_hop, &(vsrm->destination_peer), sizeof (struct GNUNET_PeerIdentity));
- }
- else
+ {
+ GNUNET_break_op (0);
+ return GNUNET_YES;
+ }
+
+ new_trail = (struct GNUNET_PeerIdentity *) &vsrm[1];
+ destination_peer = vsrm->destination_peer;
+ my_new_successor = vsrm->my_predecessor;
+ old_successor = vsrm->source_successor;
+
+ if(0 == (GNUNET_CRYPTO_cmp_peer_identity (&destination_peer, &my_identity)))
+ {
+ struct GNUNET_HashCode new_finger_trail_id;
+ /* FIXME: generate a new trail id. */
+ if (GNUNET_YES == finger_table_add (my_new_successor,
+ new_trail,
+ new_trail_length,
+ PREDECESSOR_FINGER_ID, new_finger_trail_id))
{
- memcpy (&next_hop, &trail_peer_list[my_index-1], sizeof (struct GNUNET_PeerIdentity));
+ if (new_trail_length > 0)
+ target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+ &new_trail[0]);
+ else
+ target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+ peer);
+ GDS_NEIGHBOURS_send_trail_teardown (my_identity, old_successor, trail_id,
+ GDS_ROUTING_SRC_TO_DEST, target_friend);
+ GDS_NEIGHBOURS_send_notify_new_successor (my_identity, my_new_successor,
+ new_trail,
+ new_trail_length,
+ new_finger_trail_id, target_friend);
}
-
- target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &next_hop);
- GDS_NEIGHBOURS_send_verify_successor_result (&(vsrm->destination_peer),
- &(vsrm->source_successor),
- &(vsrm->my_predecessor),
- target_friend,
- trail_peer_list,
- trail_length);
return GNUNET_OK;
}
- return GNUNET_SYSERR;
+
+ GNUNET_assert (NULL != (next_hop =
+ GDS_ROUTING_get_next_hop (trail_id, trail_direction)));
+ target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, next_hop);
+ GDS_NEIGHBOURS_send_verify_successor_result (destination_peer,
+ vsrm->source_successor,
+ my_new_successor, trail_id,
+ new_trail,
+ new_trail_length,
+ trail_direction, target_friend);
+ return GNUNET_OK;
}
-/**
+/*
* Core handle for p2p notify new successor messages.
* @param cls closure
* @param message message
handle_dht_p2p_notify_new_successor(void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message)
{
- const struct PeerNotifyNewSuccessorMessage *nsm;
- struct GNUNET_PeerIdentity *trail_peer_list;
+ struct PeerNotifyNewSuccessorMessage *nsm;
+ struct GNUNET_PeerIdentity *trail;
+ struct GNUNET_PeerIdentity source;
+ struct GNUNET_PeerIdentity destination;
+ struct FriendInfo *target_friend;
+ struct GNUNET_HashCode trail_id;
+ unsigned int my_index;
+ struct GNUNET_PeerIdentity next_hop;
size_t msize;
uint32_t trail_length;
-
+
msize = ntohs (message->size);
- if (msize < sizeof (struct PeerNotifyNewSuccessorMessage))
+ if (msize != sizeof (struct PeerNotifyNewSuccessorMessage))
{
GNUNET_break_op (0);
return GNUNET_YES;
}
- nsm = (const struct PeerNotifyNewSuccessorMessage *) message;
+
+ nsm = (struct PeerNotifyNewSuccessorMessage *) message;
trail_length = ntohl (nsm->trail_length);
-
+
if ((msize < sizeof (struct PeerNotifyNewSuccessorMessage) +
trail_length * sizeof (struct GNUNET_PeerIdentity)) ||
(trail_length >
GNUNET_break_op (0);
return GNUNET_YES;
}
-
- trail_peer_list = (struct GNUNET_PeerIdentity *) &nsm[1];
-
- if(0 == (GNUNET_CRYPTO_cmp_peer_identity (&(nsm->destination_peer), &my_identity)))
+
+ trail = (struct GNUNET_PeerIdentity *) &nsm[1];
+ source = nsm->source_peer;
+ destination = nsm->destination_peer;
+ trail_id = nsm->trail_id;
+
+ if ( 0 == GNUNET_CRYPTO_cmp_peer_identity (&my_identity, &destination))
{
- /* I am the new successor. */
- struct GNUNET_PeerIdentity new_predecessor;
- memcpy (&new_predecessor, &(nsm->source_peer), sizeof (struct GNUNET_PeerIdentity));
- if (GNUNET_NO == compare_and_update_predecessor (&new_predecessor, trail_peer_list,
- trail_length))
+ struct GNUNET_HashCode new_trail_id;
+ struct FingerInfo *my_predecessor;
+
+ my_predecessor =
+ GNUNET_CONTAINER_multihashmap32_get (finger_hashmap,
+ PREDECESSOR_FINGER_ID);
+ /* FIXME: get new_trail_id*/
+
+ if (GNUNET_YES == is_new_entry_correct_predecessor (my_predecessor,
+ source, trail,
+ trail_length))
{
- /* Someone claims to be my predecessor but its not closest predecessor
- the break. */
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
+
+ target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+ peer);
+ GDS_NEIGHBOURS_send_add_trail (my_identity, source, new_trail_id,
+ trail, trail_length, target_friend);
return GNUNET_OK;
+ }
}
- else
+
+ my_index = search_my_index (trail, trail_length);
+ if (GNUNET_SYSERR == my_index)
{
- struct FriendInfo *target_friend;
- struct GNUNET_PeerIdentity next_hop;
- int my_index;
-
- my_index = search_my_index (trail_peer_list, trail_length);
- if (GNUNET_SYSERR == my_index)
- {
- GNUNET_break(0);
- return GNUNET_SYSERR;
- }
-
- if (my_index == (trail_length - 1))
- {
- target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &(nsm->destination_peer));
- }
- else
- {
- memcpy (&next_hop, &trail_peer_list[my_index+1], sizeof (struct GNUNET_PeerIdentity));
- target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &next_hop);
- }
- /* FIXME: Should we update the entries in routing table? */
- GDS_NEIGHBOURS_send_notify_new_successor (&(nsm->source_peer),
- &(nsm->destination_peer),
- target_friend, trail_peer_list,
- trail_length);
- return GNUNET_OK;
+ GNUNET_break_op (0);
+ return GNUNET_SYSERR;
}
- return GNUNET_SYSERR;
+ if (trail_length == my_index)
+ next_hop = destination;
+ else
+ next_hop = trail[my_index + 1];
+ GNUNET_assert (GNUNET_OK == GDS_ROUTING_add (trail_id, *peer, next_hop));
+ target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &next_hop);
+ GDS_NEIGHBOURS_send_notify_new_successor (source, destination, trail,
+ trail_length,
+ trail_id, target_friend);
+ return GNUNET_OK;
}
/**
- * FIXME; Should we call select_random_friend from here in case I am the source
- * of the message or should I just return and in next iteration by default
- * we will call select random friend from send_find_finger_trail. But in that
- * case we should maintain a list of congested peer which failed to setup the
- * trail. and then in select random friend we should ignore them. this list
- * should have an expiration time and we should garbage collect it periodically.
- * Core handler for P2P trail rejection message
+ * FIXME: Here you should keep the trail id with you.
+ * Core handler for P2P trail rejection message
* @param cls closure
* @param message message
* @param peer peer identity this notification is about
* @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/
-static
-int handle_dht_p2p_trail_rejection(void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message)
+static int
+handle_dht_p2p_trail_rejection(void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message)
{
- /* Here you have recevied the message it means that the peer next to you have
- failed to setup the trail to the finger identity value. now you should call
- find_successor and make sure that you don't choose the peer as next hop
- in order to do so, you need to pass a new parameter to find successor,
- congested peer - a peer which you should ignore. once you have found this
- peer then just send a trail setup message to that peer. In case you are
- also congested then remove yourself from the trail as this message
- reached to as you are part of the trail. and then send the message to
- element before you. Ideally you should be the last element in the trail as
- all the the elements before you have rejected you. In case you are source,
- then you should call select_random_Friend(congested_peer). in case you don't
- find any peer because congested peer then set flag that all friends are busy
- and leave. */
- const struct PeerTrailRejectionMessage *trail_rejection;
+ struct PeerTrailRejectionMessage *trail_rejection;
+ unsigned int trail_length;
struct GNUNET_PeerIdentity *trail_peer_list;
- struct GNUNET_PeerIdentity source_peer;
- struct GNUNET_PeerIdentity congested_peer;
struct FriendInfo *target_friend;
+ struct GNUNET_TIME_Relative congestion_timeout;
+ struct GNUNET_HashCode trail_id;
+ struct GNUNET_PeerIdentity next_destination;
+ struct GNUNET_HashCode new_intermediate_trail_id;
struct GNUNET_PeerIdentity next_peer;
+ struct GNUNET_PeerIdentity source;
struct GNUNET_PeerIdentity *next_hop;
- struct GNUNET_PeerIdentity current_source;
- struct GNUNET_PeerIdentity current_destination;
+ uint64_t ultimate_destination_finger_value;
+ unsigned int finger_map_index;
size_t msize;
- uint32_t trail_length;
- uint32_t finger_map_index;
- uint64_t destination_finger_value;
-
+
msize = ntohs (message->size);
- if (msize < sizeof (struct PeerTrailRejectionMessage))
+ if (msize != sizeof (struct PeerTrailRejectionMessage))
{
GNUNET_break_op (0);
return GNUNET_YES;
}
-
+
trail_rejection = (struct PeerTrailRejectionMessage *) message;
trail_length = ntohl (trail_rejection->trail_length);
-
- if ((msize < sizeof (struct PeerTrailRejectionMessage) +
+
+ if ((msize != sizeof (struct PeerTrailRejectionMessage) +
trail_length * sizeof (struct GNUNET_PeerIdentity)) ||
(trail_length >
GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)))
GNUNET_break_op (0);
return GNUNET_YES;
}
-
+
trail_peer_list = (struct GNUNET_PeerIdentity *)&trail_rejection[1];
finger_map_index = ntohl (trail_rejection->finger_map_index);
- memcpy (&source_peer, &(trail_rejection->source_peer), sizeof(struct GNUNET_PeerIdentity));
- memcpy (&destination_finger_value, &(trail_rejection->finger_identity_value), sizeof (uint64_t));
- memcpy (&congested_peer, &(trail_rejection->congested_peer), sizeof (struct GNUNET_PeerIdentity));
-
- if(0 == (GNUNET_CRYPTO_cmp_peer_identity (&my_identity, &source_peer)))
+ congestion_timeout = trail_rejection->congestion_time;
+ source = trail_rejection->source_peer;
+ trail_id = trail_rejection->trail_id;
+ ultimate_destination_finger_value =
+ trail_rejection->ultimate_destination_finger_identity_value;
+
+ /* First set the congestion time of the friend that sent you this message. */
+ target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, peer);
+ target_friend->congestion_timestamp = GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get(),
+ congestion_timeout);
+
+ if(0 == (GNUNET_CRYPTO_cmp_peer_identity (&my_identity, &source)))
{
- /* I am the source of original trail setup message. Do nothing and exit. */
- /* In current implementation, when we don't get the result of a trail setup,
- then no entry is added to finger table and hence, by default a trail setup for
- the same finger map index is sent. so we don't need to send it here. */
- return GNUNET_YES;
+ return GNUNET_OK;
}
-
- if(GDS_ROUTING_check_threshold())
+
+ /* If I am congested then pass this message to peer before me in trail. */
+ if(GNUNET_YES == GDS_ROUTING_threshold_reached())
{
- /* My routing state size has crossed the threshold, I can not be part of any more
- * trails. */
struct GNUNET_PeerIdentity *new_trail;
-
+ unsigned int new_trail_length;
+
if (trail_length == 1)
{
- memcpy (&next_peer, &source_peer, sizeof (struct GNUNET_PeerIdentity));
+ new_trail = NULL;
+ new_trail_length = 0;
+ next_hop = &source;
}
else
{
- /* FIXME: Here if I got the trail rejection message then I am the last element
- in the trail. So, I should choose trail_length-2.*/
- memcpy (&next_peer, &trail_peer_list[trail_length - 2], sizeof (struct GNUNET_PeerIdentity));
+ next_hop = &trail_peer_list[trail_length - 2];
+ /* Remove myself from the trail. */
+ new_trail_length = trail_length -1;
+ new_trail = GNUNET_malloc (new_trail_length * sizeof (struct GNUNET_PeerIdentity));
+ memcpy (new_trail, trail_peer_list, new_trail_length * sizeof (struct GNUNET_PeerIdentity));
}
-
- /* Remove myself from the trail. */
- new_trail = GNUNET_malloc ((trail_length -1) * sizeof (struct GNUNET_PeerIdentity));
- memcpy (new_trail, trail_peer_list, (trail_length -1) * sizeof (struct GNUNET_PeerIdentity));
-
- /* No more trails possible through me. send a trail rejection message to next hop. */
- GDS_NEIGHBOURS_send_trail_rejection (&source_peer, destination_finger_value, &my_identity,
- &next_peer,finger_map_index, new_trail,trail_length - 1);
+
+ target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, next_hop);
+ GDS_NEIGHBOURS_send_trail_rejection (source,
+ ultimate_destination_finger_value,
+ my_identity, finger_map_index,
+ new_trail,new_trail_length,trail_id,
+ target_friend, CONGESTION_TIMEOUT);
return GNUNET_YES;
}
-
- memcpy (¤t_destination, &my_identity, sizeof (struct GNUNET_PeerIdentity));
- memcpy (¤t_source, &my_identity, sizeof (struct GNUNET_PeerIdentity));
- /* FIXME: After adding a new field in struct FriendInfo congested, then call
- find successor then it will never consider that friend by default. */
- next_hop = find_successor (destination_finger_value, ¤t_destination, ¤t_source);
-
- if (0 == (GNUNET_CRYPTO_cmp_peer_identity (&my_identity, ¤t_destination))) /* This means I am the final destination */
+
+ /* Look for next_hop to pass the trail setup message */
+ next_hop = find_successor (ultimate_destination_finger_value,
+ &next_destination,
+ &new_intermediate_trail_id,
+ finger_map_index);
+
+ if (0 == (GNUNET_CRYPTO_cmp_peer_identity (next_hop, &my_identity)))/* This means I am the final destination */
{
- if (trail_length == 1)
- {
- memcpy (&next_peer, &source_peer, sizeof (struct GNUNET_PeerIdentity));
- }
+ if (0 == trail_length)
+ next_peer = source;
else
- {
- memcpy (&next_peer, &trail_peer_list[trail_length-1], sizeof (struct GNUNET_PeerIdentity));
- }
-
+ next_peer = trail_peer_list[trail_length-1];
+
target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &next_peer);
- compare_and_update_predecessor (&source_peer, trail_peer_list, trail_length);
-
- GDS_NEIGHBOURS_send_trail_setup_result (&source_peer,
- &(my_identity),
+ GDS_NEIGHBOURS_send_trail_setup_result (source,
+ my_identity,
target_friend, trail_length,
trail_peer_list,
- finger_map_index);
- return GNUNET_OK;
- }
- else if (NULL == next_hop)
- {
- /* No peer found. Send a trail rejection message to previous peer in the trail. */
-
- struct GNUNET_PeerIdentity *new_trail;
-
- if (trail_length == 1)
- {
- memcpy (&next_peer, &source_peer, sizeof (struct GNUNET_PeerIdentity));
- }
- else
- {
- memcpy (&next_peer, &trail_peer_list[trail_length - 2], sizeof (struct GNUNET_PeerIdentity));
- }
-
- /* Remove myself from the trail. */
- new_trail = GNUNET_malloc ((trail_length -1) * sizeof (struct GNUNET_PeerIdentity));
- memcpy (new_trail, trail_peer_list, (trail_length -1) * sizeof (struct GNUNET_PeerIdentity));
-
- /* No more trails possible through me. send a trail rejection message to next hop. */
- GDS_NEIGHBOURS_send_trail_rejection (&source_peer, destination_finger_value, &my_identity,
- &next_peer,finger_map_index, new_trail,trail_length - 1);
- return GNUNET_YES;
+ finger_map_index, trail_id);
}
else
{
- /* Now add yourself to the trail. */
struct GNUNET_PeerIdentity peer_list[trail_length + 1];
+
memcpy (peer_list, trail_peer_list, trail_length * sizeof (struct GNUNET_PeerIdentity));
peer_list[trail_length] = my_identity;
- trail_length++;
-
+
target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, next_hop);
- GDS_NEIGHBOURS_send_trail_setup (&source_peer,
- destination_finger_value,
- ¤t_destination, ¤t_source,
- target_friend, trail_length, peer_list,
- finger_map_index);
+ GDS_NEIGHBOURS_send_trail_setup (source,
+ ultimate_destination_finger_value,
+ next_destination,
+ target_friend, trail_length + 1, peer_list,
+ finger_map_index, trail_id,
+ &new_intermediate_trail_id);
+ }
+ return GNUNET_OK;
+}
+
+
+/*
+ * Core handle for p2p trail tear down messages.
+ * @param cls closure
+ * @param message message
+ * @param peer peer identity this notification is about
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
+ */
+static int
+handle_dht_p2p_trail_compression (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message)
+{
+ struct PeerTrailCompressionMessage *trail_compression;
+ struct GNUNET_PeerIdentity *next_hop;
+ struct GNUNET_HashCode trail_id;
+ struct FriendInfo *target_friend;
+ size_t msize;
+
+ msize = ntohs (message->size);
+ if (msize != sizeof (struct PeerTrailCompressionMessage))
+ {
+ GNUNET_break_op (0);
+ return GNUNET_OK;
+ }
+
+ trail_compression = (struct PeerTrailCompressionMessage *) message;
+ trail_id = trail_compression->trail_id;
+
+ if (0 == (GNUNET_CRYPTO_cmp_peer_identity (&(trail_compression->new_first_friend),
+ &my_identity)))
+ {
+ if(0 != (GNUNET_CRYPTO_cmp_peer_identity (&(trail_compression->destination_peer),
+ &my_identity)))
+ {
+ GDS_ROUTING_update_trail_prev_hop (trail_id,
+ trail_compression->source_peer);
+ }
+ return GNUNET_OK;
+ }
+
+ next_hop = GDS_ROUTING_get_next_hop (trail_id, GDS_ROUTING_SRC_TO_DEST);
+ if (NULL == next_hop)
+ {
+ GNUNET_break (0); /*FIXME: How to handle this case. */
return GNUNET_OK;
}
- return GNUNET_SYSERR;
+ GNUNET_assert (GNUNET_YES == GDS_ROUTING_remove_trail (trail_id));
+ target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, next_hop);
+ GDS_NEIGHBOURS_send_trail_compression (trail_compression->source_peer,
+ trail_compression->destination_peer,
+ trail_id,
+ trail_compression->new_first_friend,
+ target_friend);
+ return GNUNET_OK;
}
-/* Core handle for p2p trail tear down messages.
+/**
+ * Core handler for trail teardown message.
* @param cls closure
* @param message message
* @param peer peer identity this notification is about
* @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/
-static
-int handle_dht_p2p_trail_teardown(void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message)
+static int
+handle_dht_p2p_trail_teardown (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message)
{
struct PeerTrailTearDownMessage *trail_teardown;
- struct GNUNET_PeerIdentity *discarded_trail;
- struct GNUNET_PeerIdentity next_hop;
- struct FriendInfo *target_friend;
- uint32_t discarded_trail_length;
+ struct GNUNET_HashCode trail_id;
+ enum GDS_ROUTING_trail_direction trail_direction;
size_t msize;
- int my_index;
-
+
msize = ntohs (message->size);
- if (msize < sizeof (struct PeerTrailTearDownMessage))
+ if (msize != sizeof (struct PeerTrailTearDownMessage))
{
GNUNET_break_op (0);
return GNUNET_OK;
}
-
+
trail_teardown = (struct PeerTrailTearDownMessage *) message;
- discarded_trail_length = ntohl (trail_teardown->trail_length);
-
- if ((msize < sizeof (struct PeerTrailTearDownMessage) +
- discarded_trail_length * sizeof (struct GNUNET_PeerIdentity)) ||
- (discarded_trail_length >
- GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)))
+ trail_direction = ntohl (trail_teardown->trail_direction);
+ trail_id = trail_teardown->TRAIL_ID;
+
+ if (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_identity,
+ &trail_teardown->destination_peer))
+ {
+ struct GNUNET_PeerIdentity *next_hop;
+ struct FriendInfo *target_friend;
+
+ next_hop = GDS_ROUTING_get_next_hop (trail_id, trail_direction);
+ if (NULL == next_hop)
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+
+ target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+ next_hop);
+ GNUNET_assert (GNUNET_YES == GDS_ROUTING_remove_trail (trail_id));
+ GDS_NEIGHBOURS_send_trail_teardown (trail_teardown->source_peer,
+ trail_teardown->destination_peer,
+ trail_id, trail_direction,
+ target_friend);
+ }
+ return GNUNET_OK;
+}
+
+
+/**
+ * Fixme: this function is called only in case in notify new successor, the new
+ * successor wants to add the source of the peer as its predecessor. Identify
+ * if there is any other use case where it is required and if yes then adapt the
+ * code for it.
+ * Core handle for p2p add trail message.
+ * @param cls closure
+ * @param message message
+ * @param peer peer identity this notification is about
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
+ */
+static int
+handle_dht_p2p_add_trail (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message)
+{
+ struct PeerAddTrailMessage *add_trail;
+ struct GNUNET_PeerIdentity *trail;
+ struct GNUNET_HashCode trail_id;
+ struct GNUNET_PeerIdentity destination_peer;
+ struct GNUNET_PeerIdentity source_peer;
+ struct GNUNET_PeerIdentity next_hop;
+ unsigned int trail_length;
+ unsigned int my_index;
+ size_t msize;
+
+ msize = ntohs (message->size);
+ if (msize != sizeof (struct PeerAddTrailMessage))
{
GNUNET_break_op (0);
return GNUNET_OK;
}
-
- discarded_trail = (struct GNUNET_PeerIdentity *) &trail_teardown[1];
-
- if (0 == (GNUNET_CRYPTO_cmp_peer_identity (&(trail_teardown->new_first_friend),
- &my_identity)))
+
+ add_trail = (struct PeerAddTrailMessage *) message;
+ trail_length = ntohl (add_trail->trail_length);
+
+ if ((msize < sizeof (struct PeerAddTrailMessage) +
+ trail_length * sizeof (struct GNUNET_PeerIdentity)) ||
+ (trail_length >
+ GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)))
{
- if(0 == (GNUNET_CRYPTO_cmp_peer_identity (&(trail_teardown->destination_peer),
- &my_identity)))
- {
- return GNUNET_OK;
- }
- else
- {
- /* FIXME:
- * I am the new first hop in the trail to reach from source to destination.
- Update the trail in routing table with prev_hop == source peer. */
- }
+ GNUNET_break_op (0);
+ return GNUNET_OK;
}
- else
+
+ trail = (struct GNUNET_PeerIdentity *)&add_trail[1];
+ destination_peer = add_trail->destination_peer;
+ source_peer = add_trail->source_peer;
+ trail_id = add_trail->trail_id;
+
+ if (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_identity,
+ &destination_peer))
{
- my_index = search_my_index (discarded_trail, discarded_trail_length);
- if(GNUNET_SYSERR == my_index)
- return GNUNET_SYSERR;
+ struct FriendInfo *target_friend;
- GDS_ROUTING_print();
- if (GNUNET_NO == GDS_ROUTING_remove_trail (&(trail_teardown->source_peer),
- &(trail_teardown->destination_peer),peer))
+ my_index = search_my_index (trail, trail_length);
+ if (GNUNET_SYSERR == my_index)
{
- /* Here we get GNUNET_NO, only if there is no matching entry found in routing
- table. */
- GNUNET_break (0);
- return GNUNET_YES;
- }
-
- memcpy (&next_hop, &discarded_trail[my_index + 1], sizeof (struct GNUNET_PeerIdentity));
- target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &next_hop);
- GDS_NEIGHBOURS_send_trail_teardown (&(trail_teardown->source_peer),
- &(trail_teardown->destination_peer),
- discarded_trail, discarded_trail_length,
- target_friend, &(trail_teardown->new_first_friend));
- return GNUNET_YES;
+ GNUNET_break_op (0);
+ return GNUNET_SYSERR;
+ }
+
+ if (0 == my_index)
+ next_hop = source_peer;
+ else
+ next_hop = trail[trail_length - 1];
+
+ GNUNET_assert (GNUNET_OK == GDS_ROUTING_add (trail_id, next_hop, *peer));
+ target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &next_hop);
+ GDS_NEIGHBOURS_send_add_trail (source_peer, destination_peer, trail_id,
+ trail, trail_length, target_friend);
}
- return GNUNET_SYSERR;
+ return GNUNET_OK;
}
/**
- * Iterate over finger_peermap, and remove entries with peer as the first element
- * of their trail.
+ *FIXME; call send_trail_teardown_message on all the trails of the finger that
+ * you remove. Also you don't need to decerement friend trail count as that
+ * friend is removed. But you can not send trail teardown message as the friend
+ * is disconnected. then you don't have any next_hop. and in case there are
+ * multiple trails. and friend is the first trail then you remove only the trail.
+ * Iterate over finger_hashmap, and remove entries if finger is the disconnected
+ * peer or if disconnected peer is the first friend in the trail to reach the
+ * finger.
* @param cls closure
* @param key current public key
* @param value value in the hash map
*/
static int
remove_matching_finger (void *cls,
- const struct GNUNET_PeerIdentity *key,
+ uint32_t key,
void *value)
{
struct FingerInfo *remove_finger = value;
const struct GNUNET_PeerIdentity *disconnected_peer = cls;
-
- if (0 == GNUNET_CRYPTO_cmp_peer_identity (&remove_finger->first_trail_head->peer, disconnected_peer)
- || (0 == GNUNET_CRYPTO_cmp_peer_identity (&(remove_finger->finger_identity), disconnected_peer)))
+ struct TrailList *trail_list;
+ int i;
+
+ if (0 == GNUNET_CRYPTO_cmp_peer_identity (&remove_finger->finger_identity,
+ disconnected_peer))
{
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multipeermap_remove (finger_peermap,
- key,
+ GNUNET_CONTAINER_multihashmap32_remove (finger_hashmap,
+ key,
remove_finger));
free_finger (remove_finger);
+ return GNUNET_YES;
}
-
+
+ for (i = 0; i< remove_finger->trails_count; i++)
+ {
+ trail_list = &remove_finger->trail_list[i];
+ if (0 == GNUNET_CRYPTO_cmp_peer_identity (&trail_list->trail_head->peer,
+ disconnected_peer))
+ {
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap32_remove (finger_hashmap,
+ key,
+ remove_finger));
+ free_finger (remove_finger);
+ }
+ }
+
return GNUNET_YES;
}
const struct GNUNET_PeerIdentity *peer)
{
struct FriendInfo *remove_friend;
-
- /* Check for self message. */
+
if (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity)))
return;
-
- /* Search for peer to remove in your friend_peermap. */
+
remove_friend =
GNUNET_CONTAINER_multipeermap_get (friend_peermap, peer);
-
+
if (NULL == remove_friend)
{
GNUNET_break (0);
return;
}
- /* Remove fingers for which this peer is the first element in the trail or if
- * the friend is a finger. */
- GNUNET_CONTAINER_multipeermap_iterate (finger_peermap,
- &remove_matching_finger, (void *)peer);
-
- /* Remove routing trails of which this peer is a part.
- * FIXME: Here do we only remove the entry from our own routing table
- * or do we also inform other peers which are part of trail. It seems to be
- * too much of messages exchanged. */
- GDS_ROUTING_print();
- GDS_ROUTING_remove_entry (peer);
-
- /* Remove the peer from friend_peermap. */
+ GNUNET_assert (GNUNET_SYSERR !=
+ GNUNET_CONTAINER_multihashmap32_iterate (finger_hashmap,
+ &remove_matching_finger,
+ (void *)peer));
+ GDS_ROUTING_remove_trail_by_peer (peer);
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multipeermap_remove (friend_peermap,
peer,
remove_friend));
-
+
if (0 != GNUNET_CONTAINER_multipeermap_size (friend_peermap))
return;
-
+
if (GNUNET_SCHEDULER_NO_TASK != find_finger_trail_task)
{
GNUNET_SCHEDULER_cancel (find_finger_trail_task);
/* Check for connect to self message */
if (0 == memcmp (&my_identity, peer_identity, sizeof (struct GNUNET_PeerIdentity)))
return;
-
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connected to %s\n", GNUNET_i2s (peer_identity));
-
+
/* If peer already exists in our friend_peermap, then exit. */
if (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (friend_peermap, peer_identity))
{
GNUNET_break (0);
return;
}
-
+
GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# peers connected"), 1,
GNUNET_NO);
friend = GNUNET_new (struct FriendInfo);
friend->id = *peer_identity;
- friend->trails_count = 0;
-
+
GNUNET_assert (GNUNET_OK ==
GNUNET_CONTAINER_multipeermap_put (friend_peermap,
peer_identity, friend,
static struct GNUNET_CORE_MessageHandler core_handlers[] = {
{&handle_dht_p2p_put, GNUNET_MESSAGE_TYPE_DHT_P2P_PUT, 0},
{&handle_dht_p2p_get, GNUNET_MESSAGE_TYPE_DHT_P2P_GET, 0},
- {&handle_dht_p2p_get_result, GNUNET_MESSAGE_TYPE_DHT_P2P_GET_RESULT, 0},
+ {&handle_dht_p2p_get_result, GNUNET_MESSAGE_TYPE_DHT_P2P_GET_RESULT, 0},
{&handle_dht_p2p_trail_setup, GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP, 0},
{&handle_dht_p2p_trail_setup_result, GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP_RESULT, 0},
{&handle_dht_p2p_verify_successor, GNUNET_MESSAGE_TYPE_DHT_P2P_VERIFY_SUCCESSOR, 0},
{&handle_dht_p2p_verify_successor_result, GNUNET_MESSAGE_TYPE_DHT_P2P_VERIFY_SUCCESSOR_RESULT, 0},
{&handle_dht_p2p_notify_new_successor, GNUNET_MESSAGE_TYPE_DHT_P2P_NOTIFY_NEW_SUCCESSOR, 0},
{&handle_dht_p2p_trail_rejection, GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_REJECTION, 0},
- {&handle_dht_p2p_trail_teardown, GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_TEARDOWN, 0},
+ {&handle_dht_p2p_trail_compression, GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_COMPRESSION, 0},
+ {&handle_dht_p2p_trail_teardown, GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_TEARDOWN, 0},
+ {&handle_dht_p2p_add_trail, GNUNET_MESSAGE_TYPE_DHT_P2P_ADD_TRAIL, 0},
{NULL, 0, 0}
};
-
+
core_api =
GNUNET_CORE_connect (GDS_cfg, NULL, &core_init, &handle_core_connect,
&handle_core_disconnect, NULL, GNUNET_NO, NULL,
GNUNET_NO, core_handlers);
if (NULL == core_api)
return GNUNET_SYSERR;
-
+
friend_peermap = GNUNET_CONTAINER_multipeermap_create (256, GNUNET_NO);
- finger_peermap = GNUNET_CONTAINER_multipeermap_create (MAX_FINGERS * 4/3, GNUNET_NO);
- all_friends_trail_threshold = GNUNET_NO;
+ finger_hashmap = GNUNET_CONTAINER_multihashmap32_create (MAX_FINGERS * 4/3);
return GNUNET_OK;
}
-
/**
* Shutdown neighbours subsystem.
*/
{
if (NULL == core_api)
return;
-
+
GNUNET_CORE_disconnect (core_api);
core_api = NULL;
-
+
GNUNET_assert (0 == GNUNET_CONTAINER_multipeermap_size (friend_peermap));
GNUNET_CONTAINER_multipeermap_destroy (friend_peermap);
friend_peermap = NULL;
-
- GNUNET_assert (0 == GNUNET_CONTAINER_multipeermap_size (finger_peermap));
- GNUNET_CONTAINER_multipeermap_destroy (finger_peermap);
- finger_peermap = NULL;
-
- /* FIXME: Here I have added GNUNET_break(0) as ideally if friend_peermap
- is already zero, then we really don't need to cancel it again. If this
- condition happens it mean we might have missed some corner case. But we
- cancel the task only in handle_core_disconnect. it may happen that this
- function is called but not handle_core_disconnect, In that case GNUNET_break(0)
- is not needed. */
+
+ GNUNET_assert (0 == GNUNET_CONTAINER_multihashmap32_size (finger_hashmap));
+ GNUNET_CONTAINER_multihashmap32_destroy (finger_hashmap);
+ finger_hashmap = NULL;
+
if (GNUNET_SCHEDULER_NO_TASK != find_finger_trail_task)
{
GNUNET_break (0);
*
* @return my identity
*/
-struct GNUNET_PeerIdentity
+struct GNUNET_PeerIdentity
GDS_NEIGHBOURS_get_my_id (void)
{
return my_identity;
}
-
-
-/* end of gnunet-service-xdht_neighbours.c */
\ No newline at end of file
projects / oweals / gnunet.git / blobdiff